diff --git a/device/samsung/avl7420/device.mk b/device/samsung/avl7420/device.mk
index d9497b1..ccee393 100755
--- a/device/samsung/avl7420/device.mk
+++ b/device/samsung/avl7420/device.mk
@@ -576,6 +576,8 @@ PRODUCT_PROPERTY_OVERRIDES += \
ro.config.hifi_audio=1 \
ro.config.media_vol_steps = 60
endif
+
PRODUCT_PROPERTY_OVERRIDES += ro.lockscreen.disable.default=true
PRODUCT_PACKAGES += \
libusb_1.0 \
diff --git a/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
index ff523a8..6e3e3b0 100644
--- a/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
+++ b/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
@@ -78,7 +78,7 @@
/system/media/audio/ui/Trusted.ogg
/system/media/audio/ui/WirelessChargingStarted.ogg
- false
+
true
false
1