Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61dfb4a0 authored by Harshit Mahajan's avatar Harshit Mahajan Committed by Android (Google) Code Review
Browse files

Merge "Mark BIND_EXPLICIT_HEALTH_CHECK_SERVICE as SystemApi" into main

parents cc862807 ec15f27e

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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";

core/res/AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -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).

    -->