Android 不锁屏

diff --git a/device/rockchip/rk3288/system.prop b/device/rockchip/rk3288/system.
index 0d2c248..5a9ca3f 100644
--- a/device/rockchip/rk3288/system.prop
+++ b/device/rockchip/rk3288/system.prop
@@ -18,8 +18,8 @@ debug.nfc.fw_download=false
 debug.nfc.se=false

 #add Rockchip properties here
-ro.rk.screenoff_time=60000
-ro.rk.screenshot_enable=true
+ro.rk.screenoff_time=-1
+ro.rk.screenshot_enable=false
 ro.rk.def_brightness=200
 ro.rk.homepage_base=http://www.google.com/webhp?client={CID}&source=android
 ro.rk.install_non_market_apps=false
diff --git a/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b
index f01c1d3..d95e343 100644
--- a/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
+++ b/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
@@ -30,7 +30,7 @@
     <integer name="def_half_screen_app_location">0</integer>
     <string name="def_screenshot_location">/mnt/sdcard</string>
     <bool name="def_dim_screen">true</bool>
-    <integer name="def_screen_off_timeout">60000</integer>
+    <integer name="def_screen_off_timeout">-1</integer>
     <integer name="def_sleep_timeout">-1</integer>
     <bool name="def_airplane_mode_on">false</bool>
     <bool name="def_theater_mode_on">false</bool>
@@ -91,7 +91,7 @@
     <string name="def_trusted_sound" translatable="false">/system/media/audio/u
     <string name="def_wireless_charging_started_sound" translatable="false">/sy

-    <bool name="def_lockscreen_disabled">false</bool>
+    <bool name="def_lockscreen_disabled">true</bool>
     <bool name="def_device_provisioned">false</bool>
     <integer name="def_dock_audio_media_enabled">1</integer>

diff --git a/frameworks/base/packages/SystemUI/src/com/android/systemui/keyguard
index e66934e..0e7707c 100755
--- a/frameworks/base/packages/SystemUI/src/com/android/systemui/keyguard/Keygua
+++ b/frameworks/base/packages/SystemUI/src/com/android/systemui/keyguard/Keygua
@@ -186,7 +186,7 @@ public class KeyguardViewMediator extends SystemUI {

     // Whether the next call to playSounds() should be skipped.  Defaults to
     // true because the first lock (on boot) should be silent.
-    private boolean mSuppressNextLockSound = true;
+    private boolean mSuppressNextLockSound = false;


     /** High level access to the power manager for WakeLocks */
diff --git a/frameworks/base/services/core/java/com/android/server/LockSettingsS
index 77662cc..033dafb 100644
--- a/frameworks/base/services/core/java/com/android/server/LockSettingsService.
+++ b/frameworks/base/services/core/java/com/android/server/LockSettingsService.
@@ -88,7 +88,7 @@ public class LockSettingsService extends ILockSettings.Stub {
             public void initialize(SQLiteDatabase db) {
                 // Get the lockscreen default from a system property, if availa
                 boolean lockScreenDisable = SystemProperties.getBoolean(
-                        "ro.lockscreen.disable.default", false);
+                        "ro.lockscreen.disable.default", true);
                 if (lockScreenDisable) {
                     mStorage.writeKeyValue(db, LockPatternUtils.DISABLE_LOCKSCR
                 }