RK3566 android13 设置不熄屏不锁屏

diff --git a/device.mk b/device.mk
index 02be5f7..f7c9e44 100644
--- a/device.mk
+++ b/device.mk
@@ -677,7 +677,9 @@ ifeq ($(strip $(TARGET_BOARD_PLATFORM_PRODUCT)), box)
       ro.rk.screenoff_time=2147483647
 else
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.rk.screenoff_time=60000
+    ro.rk.screenoff_time=2147483647
+#    ro.rk.screenoff_time=60000
+# liguoyi 251011 Screen-off control
 endif
 
 # incrementalfs config
diff --git a/overlay_go/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/overlay_go/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
index d1abd4d..c5d245e 100755
--- a/overlay_go/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
+++ b/overlay_go/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
@@ -17,7 +17,8 @@
  */
 -->
 <resources>
-    <integer name="def_screen_off_timeout">60000</integer>
+    <!-- liguoyi 251011 Screen-off control -->
+    <integer name="def_screen_off_timeout">2147483647</integer>
    <!-- Initial value for the Settings.Secure.IMMERSIVE_MODE_CONFIRMATIONS setting,
          which is a comma separated list of packages that no longer need confirmation
          for immersive mode.

diff --git a/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
index b02c48b..21f4091 100755
--- a/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
+++ b/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
@@ -17,7 +17,8 @@
  */
 -->
 <resources>
-    <integer name="def_screen_off_timeout">60000</integer>
+    <!-- liguoyi 251011 Screen-off control -->
+    <integer name="def_screen_off_timeout">2147483647</integer>
    <!-- Initial value for the Settings.Secure.IMMERSIVE_MODE_CONFIRMATIONS setting,
          which is a comma separated list of packages that no longer need confirmation
          for immersive mode.
diff --git a/rk3566_t/BoardConfig.mk b/rk3566_t/BoardConfig.mk
index 5eefe65..fbfe59d 100644
--- a/rk3566_t/BoardConfig.mk
+++ b/rk3566_t/BoardConfig.mk
@@ -17,7 +17,7 @@ include device/rockchip/rk356x/BoardConfig.mk
 BUILD_WITH_GO_OPT := false
 
 PRODUCT_UBOOT_CONFIG := rk3566
-PRODUCT_KERNEL_DTS := rk3566-evb2-lp4x-v10
+PRODUCT_KERNEL_DTS := tspi-rk3566-user-v10-linux#rk3566-evb2-lp4x-v10
 BOARD_GSENSOR_MXC6655XA_SUPPORT := true
 BOARD_CAMERA_SUPPORT_EXT := true
 BOARD_HS_ETHERNET := true
diff --git a/rk3566_t/rk3566_t.mk b/rk3566_t/rk3566_t.mk
index dc88e76..9bc066d 100644
--- a/rk3566_t/rk3566_t.mk
+++ b/rk3566_t/rk3566_t.mk
@@ -44,3 +44,4 @@ PRODUCT_PROPERTY_OVERRIDES += ro.wifi.sleep.power.down=true
 PRODUCT_PROPERTY_OVERRIDES += persist.wifi.sleep.delay.ms=0
 PRODUCT_PROPERTY_OVERRIDES += persist.bt.power.down=true
 PRODUCT_PROPERTY_OVERRIDES += ro.vendor.hdmirotationlock=true
+PRODUCT_PROPERTY_OVERRIDES += persist.sys.locale=zh-CN

diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml
index 99b15db780dc..ed59aba4c53d 100644
--- a/packages/SettingsProvider/res/values/defaults.xml
+++ b/packages/SettingsProvider/res/values/defaults.xml
@@ -18,7 +18,8 @@
 -->
 <resources>
     <bool name="def_dim_screen">true</bool>
-    <integer name="def_screen_off_timeout">60000</integer>
+    <!-- liguoyi 251011 Screen-off control, unit of milliseconds -->
+    <integer name="def_screen_off_timeout">2147483647</integer>
     <integer name="def_sleep_timeout">-1</integer>
     <bool name="def_airplane_mode_on">false</bool>
     <bool name="def_theater_mode_on">false</bool>
@@ -71,7 +72,8 @@
     <string name="def_desk_undock_sound" translatable="false">/product/media/audio/ui/Undock.ogg</string>
     <string name="def_car_dock_sound" translatable="false">/product/media/audio/ui/Dock.ogg</string>
     <string name="def_car_undock_sound" translatable="false">/product/media/audio/ui/Undock.ogg</string>
-    <integer name="def_lockscreen_sounds_enabled">1</integer>
+    <!-- liguoyi 251011 Does it play a sound when unlocking or locking the screen, 0-not play 1-play -->
+    <integer name="def_lockscreen_sounds_enabled">0</integer>
     <string name="def_lock_sound" translatable="false">/product/media/audio/ui/Lock.ogg</string>
     <string name="def_unlock_sound" translatable="false">/product/media/audio/ui/Unlock.ogg</string>
     <string name="def_trusted_sound" translatable="false">/product/media/audio/ui/Trusted.ogg</string>
@@ -82,7 +84,8 @@
     <integer name="def_max_sound_trigger_detection_service_ops_per_day" translatable="false">1000</integer>
     <integer name="def_sound_trigger_detection_service_op_timeout" translatable="false">15000</integer>
 
-    <bool name="def_lockscreen_disabled">false</bool>
+    <!-- liguoyi 251011 Default lock screen has been disabled -->
+    <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/res/values/arrays.xml b/res/values/arrays.xml
index 354e01ad19..0b01151bd1 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -48,6 +48,8 @@
         <item>5 minutes</item>
         <item>10 minutes</item>
         <item>30 minutes</item>
+        <!-- liguoyi 251011 Screen-off control -->
+        <item>Never</item>
     </string-array>
 
     <!-- Do not translate. -->
@@ -66,6 +68,8 @@
         <item>600000</item>
         <!-- Do not translate. -->
         <item>1800000</item>
+        <!-- liguoyi 251011 Screen-off control -->
+        <item>2147483647</item>
     </string-array>
 
     <!-- Display settings.  The delay in inactivity before the dream is shown. These are shown in a list dialog. -->