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

Commit 3f9f2a07 authored by Hunsuk Choi's avatar Hunsuk Choi Committed by Android (Google) Code Review
Browse files

Merge "Add a new permission for domain selection service" into main

parents 0a2ae8a0 fbe92b6c

core/api/system-current.txt

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

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

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

    field @FlaggedApi("com.android.internal.telephony.flags.ap_domain_selection_enabled") 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 public static final String BIND_EXTERNAL_STORAGE_SERVICE = "android.permission.BIND_EXTERNAL_STORAGE_SERVICE";

core/res/AndroidManifest.xml

+10 −0
Original line number Diff line number Diff line
@@ -2956,6 +2956,16 @@ 
    <permission android:name="android.permission.MANAGE_SENSORS"

        android:protectionLevel="signature" />



    <!-- Must be required by a DomainSelectionService to ensure that only the

         system can bind to it.

         <p>Protection level: signature

         @SystemApi

         @hide

         @FlaggedApi("com.android.internal.telephony.flags.ap_domain_selection_enabled")

    -->

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

        android:protectionLevel="signature" />



    <!-- Must be required by an ImsService to ensure that only the

         system can bind to it.

         <p>Protection level: signature|privileged|vendorPrivileged

data/etc/privapp-permissions-platform.xml

+1 −0
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ applications that come with the platform 
        <permission name="android.permission.BIND_CARRIER_MESSAGING_SERVICE"/>

        <permission name="android.permission.BIND_CARRIER_SERVICES"/>

        <permission name="android.permission.BIND_CELL_BROADCAST_SERVICE"/>

        <permission name="android.permission.BIND_DOMAIN_SELECTION_SERVICE"/>

        <permission name="android.permission.BIND_IMS_SERVICE"/>

        <permission name="android.permission.BIND_SATELLITE_GATEWAY_SERVICE"/>

        <permission name="android.permission.BIND_SATELLITE_SERVICE"/>