[automerger skipped] Merge 24Q4 (ab/12406339) into aosp-main-future am: 7118ee48ff -s ours

am skip reason: Merged-In Ib8fd53fa76fd1767d56653e0baae263d4f73c822 with SHA-1 a9c19914f2 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/libsysprop/+/30284080

Change-Id: I28c2ae53fce7854096bc6c55baf0874eef6acff8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

srcs/Android.bp

diff --git a/srcs/Android.bp b/srcs/Android.bp
index 1ca4e99..e584604 100644
--- a/srcs/Android.bp
+++ b/srcs/Android.bp
@@ -29,6 +29,7 @@
         "com.android.art.debug",
         "com.android.btservices",
         "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/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 {