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

Commit 2f7b650a authored by Jason Parks's avatar Jason Parks Committed by Android (Google) Code Review
Browse files

Merge "Add the BIND_SUPERVISION_APP_SERVICE permission" into main

parents 804bc7ea 475484a3

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ package android { 
    field public static final String BIND_SATELLITE_SERVICE = "android.permission.BIND_SATELLITE_SERVICE";

    field public static final String BIND_SETTINGS_SUGGESTIONS_SERVICE = "android.permission.BIND_SETTINGS_SUGGESTIONS_SERVICE";

    field public static final String BIND_SOUND_TRIGGER_DETECTION_SERVICE = "android.permission.BIND_SOUND_TRIGGER_DETECTION_SERVICE";

    field @FlaggedApi("android.permission.flags.supervision_role_enabled") public static final String BIND_SUPERVISION_APP_SERVICE = "android.permission.BIND_SUPERVISION_APP_SERVICE";

    field public static final String BIND_TELEPHONY_DATA_SERVICE = "android.permission.BIND_TELEPHONY_DATA_SERVICE";

    field public static final String BIND_TELEPHONY_NETWORK_SERVICE = "android.permission.BIND_TELEPHONY_NETWORK_SERVICE";

    field public static final String BIND_TEXTCLASSIFIER_SERVICE = "android.permission.BIND_TEXTCLASSIFIER_SERVICE";

core/java/android/permission/flags.aconfig

+9 −0
Original line number Diff line number Diff line
@@ -541,3 +541,12 @@ flag { 
    description: "This flag is used to enable the role behavior for the system supervision role"

    bug: "378102594"

}



flag {

    name: "supervision_role_enabled"

    is_fixed_read_only: true

    is_exported: true

    namespace: "supervision"

    description: "This flag is used to enable the supervision role"

    bug: "401490610"

}

core/res/AndroidManifest.xml

+13 −1
Original line number Diff line number Diff line
@@ -7688,7 +7688,7 @@ 
                android:protectionLevel="signature" />



    <!-- @SystemApi Allows applications to kill UIDs.

        <p>This permission can be granted to the SYSTEM_SUPERVISOR role used for parental

        <p>This permission can be granted to the SYSTEM_SUPERVISION role used for parental

        controls.

        <p>Not for use by third-party applications.

         @hide -->
@@ -9090,6 +9090,18 @@ 
        android:protectionLevel="signature|role|privileged"

        android:featureFlag="android.permission.flags.text_classifier_choice_api_enabled"/>



    <!--

        @SystemApi

        @FlaggedApi(android.permission.flags.Flags.FLAG_SUPERVISION_ROLE_ENABLED)

        Must be required by a {@link android.app.supervision.SupervisionAppService},

        to ensure that only the system can bind to it.

        <p>Protection level: signature

        @hide

    -->

    <permission android:name="android.permission.BIND_SUPERVISION_APP_SERVICE"

        android:protectionLevel="signature"

        android:featureFlag="android.permission.flags.supervision_role_enabled" />



    <!-- Attribution for Geofencing service. -->

    <attribution android:tag="GeofencingService" android:label="@string/geofencing_service"/>

    <!-- Attribution for Country Detector. -->