commit ec15f27efae14e5a3b294ddc2f52116102889c2d
author Harshit Mahajan <harshitmahajan@google.com> Tue Aug 20 18:57:35 2024 +0000
committer Harshit Mahajan <harshitmahajan@google.com> Tue Aug 20 20:54:32 2024 +0000
tree a536787c55ea964b7c1cf6c0b5e8b9650f07fec7
parent 9302f8498f204d4e9cb098bd749cab778447af70

Mark BIND_EXPLICIT_HEALTH_CHECK_SERVICE as SystemApi

ExplicitHealthCheckService is being moved to a CrashRecovery module.
It uses this permission to ensure that only certain services can be bounded.

Bug: 354693320
Test: TH
Flag: android.crashrecovery.flags.enable_crashrecovery
Change-Id: I78eba5048290003a29ffd6811e3f18e57e8c8b8a

core/api/system-current.txt

diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index f483691..d858c74 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -61,6 +61,7 @@
     field @FlaggedApi("com.android.internal.telephony.flags.use_oem_domain_selection_service") public static final String BIND_DOMAIN_SELECTION_SERVICE = "android.permission.BIND_DOMAIN_SELECTION_SERVICE";
     field public static final String BIND_DOMAIN_VERIFICATION_AGENT = "android.permission.BIND_DOMAIN_VERIFICATION_AGENT";
     field public static final String BIND_EUICC_SERVICE = "android.permission.BIND_EUICC_SERVICE";
+    field @FlaggedApi("android.crashrecovery.flags.enable_crashrecovery") public static final String BIND_EXPLICIT_HEALTH_CHECK_SERVICE = "android.permission.BIND_EXPLICIT_HEALTH_CHECK_SERVICE";
     field public static final String BIND_EXTERNAL_STORAGE_SERVICE = "android.permission.BIND_EXTERNAL_STORAGE_SERVICE";
     field public static final String BIND_FIELD_CLASSIFICATION_SERVICE = "android.permission.BIND_FIELD_CLASSIFICATION_SERVICE";
     field public static final String BIND_GBA_SERVICE = "android.permission.BIND_GBA_SERVICE";

core/res/AndroidManifest.xml

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 160f651..ead58f5 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -7650,7 +7650,8 @@
     <permission android:name="android.permission.BIND_CARRIER_MESSAGING_CLIENT_SERVICE"
         android:protectionLevel="signature" />
 
-    <!-- Must be required by an {@link android.service.watchdog.ExplicitHealthCheckService} to
+    <!-- @FlaggedApi(android.crashrecovery.flags.Flags.FLAG_ENABLE_CRASHRECOVERY) @SystemApi
+         Must be required by an {@link android.service.watchdog.ExplicitHealthCheckService} to
          ensure that only the system can bind to it.
          @hide This is not a third-party API (intended for OEMs and system apps).
     -->