Merge 25Q1 (ab/12770256) to aosp-main-future

Bug: 385190204
Merged-In: I583c0bfdcc98508ae24cb0d2ac374ff9e51b6203
Change-Id: I29ef03753eeb00d8da884cff440b1f3a13de8225

srcs/Android.bp

diff --git a/srcs/Android.bp b/srcs/Android.bp
index e3314b7..1ac55ab 100644
--- a/srcs/Android.bp
+++ b/srcs/Android.bp
@@ -29,6 +29,7 @@
         "com.android.art.debug",
         "com.android.bt",
         "com.android.compos",
+        "com.android.crashrecovery",
         "com.android.nfcservices",
         "com.android.media.swcodec",
         "com.android.tethering",

srcs/android/sysprop/CrashRecoveryProperties.sysprop

diff --git a/srcs/android/sysprop/CrashRecoveryProperties.sysprop b/srcs/android/sysprop/CrashRecoveryProperties.sysprop
index c9aaa71..34c44d8 100644
--- a/srcs/android/sysprop/CrashRecoveryProperties.sysprop
+++ b/srcs/android/sysprop/CrashRecoveryProperties.sysprop
@@ -18,7 +18,7 @@
 prop {
     api_name: "lastFactoryResetTimeMs"
     type: Long
-    scope: Internal
+    scope: Public
     access: ReadWrite
     prop_name: "persist.crashrecovery.last_factory_reset"
 }
@@ -28,7 +28,7 @@
 prop {
     api_name: "rescueBootStart"
     type: Long
-    scope: Internal
+    scope: Public
     access: ReadWrite
     prop_name: "crashrecovery.rescue_boot_start"
 }
@@ -36,7 +36,7 @@
 prop {
     api_name: "rescueBootCount"
     type: Integer
-    scope: Internal
+    scope: Public
     access: ReadWrite
     prop_name: "crashrecovery.rescue_boot_count"
 }
@@ -46,7 +46,7 @@
 prop {
     api_name: "bootMitigationStart"
     type: Long
-    scope: Internal
+    scope: Public
     access: ReadWrite
     prop_name: "crashrecovery.boot_mitigation_start"
 }
@@ -54,7 +54,7 @@
 prop {
     api_name: "bootMitigationCount"
     type: Integer
-    scope: Internal
+    scope: Public
     access: ReadWrite
     prop_name: "crashrecovery.boot_mitigation_count"
 }
@@ -62,7 +62,7 @@
 prop {
     api_name: "attemptingReboot"
     type: Boolean
-    scope: Internal
+    scope: Public
     access: ReadWrite
     prop_name: "crashrecovery.attempting_reboot"
 }
@@ -70,7 +70,7 @@
 prop {
     api_name: "attemptingFactoryReset"
     type: Boolean
-    scope: Internal
+    scope: Public
     access: ReadWrite
     prop_name: "crashrecovery.attempting_factory_reset"
 }
@@ -78,7 +78,7 @@
 prop {
     api_name: "maxRescueLevelAttempted"
     type: Integer
-    scope: Internal
+    scope: Public
     access: ReadWrite
     prop_name: "crashrecovery.max_rescue_level_attempted"
 }
@@ -86,7 +86,7 @@
 prop {
     api_name: "enableRescueParty"
     type: Boolean
-    scope: Internal
+    scope: Public
     access: ReadWrite
     prop_name: "persist.crashrecovery.enable_rescue"
 }

srcs/android/sysprop/InputProperties.sysprop

diff --git a/srcs/android/sysprop/InputProperties.sysprop b/srcs/android/sysprop/InputProperties.sysprop
index 769002a..4059654 100644
--- a/srcs/android/sysprop/InputProperties.sysprop
+++ b/srcs/android/sysprop/InputProperties.sysprop
@@ -33,16 +33,6 @@
     prop_name: "persist.input.enable_motion_prediction"
 }
 
-# A flag to enable the new Keyboard backlight controller introduced in Android U, that allows
-# Framework to control keyboard backlight on supported devices.
-prop {
-    api_name: "enable_keyboard_backlight_control"
-    type: Boolean
-    scope: Internal
-    access: Readonly
-    prop_name: "persist.input.keyboard.backlight_control.enabled"
-}
-
 # A flag to force showing a pointer icon for stylus pointers, even when the device is not
 # configured for it. Used for debugging stylus pointer icons. Requires restart.
 prop {
@@ -71,22 +61,3 @@
     prop_name: "persist.debug.input.enable_input_device_usage_metrics"
 }
 
-# A flag to enable the Custom levels provided via IDC files for Keyboard backlight
-# introduced in Android U-QPR1.
-prop {
-    api_name: "enable_keyboard_backlight_custom_levels"
-    type: Boolean
-    scope: Internal
-    access: Readonly
-    prop_name: "persist.input.keyboard.backlight_custom_levels.enabled"
-}
-
-
-# A flag to enable ALS based keyboard backlight control introduced in Android U-QPR1.
-prop {
-    api_name: "enable_ambient_keyboard_backlight_control"
-    type: Boolean
-    scope: Internal
-    access: Readonly
-    prop_name: "persist.input.keyboard.ambient_backlight_control.enabled"
-}

srcs/api/PlatformProperties-current.txt

diff --git a/srcs/api/PlatformProperties-current.txt b/srcs/api/PlatformProperties-current.txt
index e78f2b1..ddd908b 100644
--- a/srcs/api/PlatformProperties-current.txt
+++ b/srcs/api/PlatformProperties-current.txt
@@ -281,6 +281,60 @@
   }
 }
 props {
+  module: "android.sysprop.CrashRecoveryProperties"
+  prop {
+    api_name: "attemptingFactoryReset"
+    access: ReadWrite
+    prop_name: "crashrecovery.attempting_factory_reset"
+  }
+  prop {
+    api_name: "attemptingReboot"
+    access: ReadWrite
+    prop_name: "crashrecovery.attempting_reboot"
+  }
+  prop {
+    api_name: "bootMitigationCount"
+    type: Integer
+    access: ReadWrite
+    prop_name: "crashrecovery.boot_mitigation_count"
+  }
+  prop {
+    api_name: "bootMitigationStart"
+    type: Long
+    access: ReadWrite
+    prop_name: "crashrecovery.boot_mitigation_start"
+  }
+  prop {
+    api_name: "enableRescueParty"
+    access: ReadWrite
+    prop_name: "persist.crashrecovery.enable_rescue"
+  }
+  prop {
+    api_name: "lastFactoryResetTimeMs"
+    type: Long
+    access: ReadWrite
+    prop_name: "persist.crashrecovery.last_factory_reset"
+  }
+  prop {
+    api_name: "maxRescueLevelAttempted"
+    type: Integer
+    access: ReadWrite
+    prop_name: "crashrecovery.max_rescue_level_attempted"
+  }
+  prop {
+    api_name: "rescueBootCount"
+    type: Integer
+    access: ReadWrite
+    prop_name: "crashrecovery.rescue_boot_count"
+  }
+  prop {
+    api_name: "rescueBootStart"
+    type: Long
+    access: ReadWrite
+    prop_name: "crashrecovery.rescue_boot_start"
+  }
+}
+props {
   owner: Odm
   module: "android.sysprop.DeviceProperties"
   prop {