diff options
| author | 2024-09-02 12:25:10 +0000 | |
|---|---|---|
| committer | 2024-09-02 12:25:10 +0000 | |
| commit | 61dfb4a024feb86ea3bc5c4c3d9f67f963c8a22c (patch) | |
| tree | 8bedf10270ff1317893a244618a447e933f3ac3c | |
| parent | cc8628075b33e0a860d24324560295c9142ba942 (diff) | |
| parent | ec15f27efae14e5a3b294ddc2f52116102889c2d (diff) | |
Merge "Mark BIND_EXPLICIT_HEALTH_CHECK_SERVICE as SystemApi" into main
| -rw-r--r-- | core/api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 3637ca763e0a..a59bc3e0b7bd 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -61,6 +61,7 @@ package android { 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"; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 17ff2ebc4f20..5decf7f7c2f7 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -7648,7 +7648,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). --> |