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

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

Merge "Change the feature flag of BIND_DOMAIN_SELECTION_SERVICE permission" into main

parents b495bf3a b59c3b38

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +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 @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 public static final String BIND_EXTERNAL_STORAGE_SERVICE = "android.permission.BIND_EXTERNAL_STORAGE_SERVICE";

core/res/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -2961,7 +2961,7 @@ 
         <p>Protection level: signature

         @SystemApi

         @hide

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

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

    -->

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

        android:protectionLevel="signature" />