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

Commit 59c490f2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Renamed BIND_DATA_SERVICE to BIND_TELEPHONY_DATA_SERVICE"

parents 414a7c2b 568b81ac

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package android { 
    field public static final java.lang.String BATTERY_STATS = "android.permission.BATTERY_STATS";

    field public static final java.lang.String BIND_APPWIDGET = "android.permission.BIND_APPWIDGET";

    field public static final deprecated java.lang.String BIND_CONNECTION_SERVICE = "android.permission.BIND_CONNECTION_SERVICE";

    field public static final java.lang.String BIND_DATA_SERVICE = "android.permission.BIND_DATA_SERVICE";

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

    field public static final java.lang.String BIND_IMS_SERVICE = "android.permission.BIND_IMS_SERVICE";

    field public static final java.lang.String BIND_KEYGUARD_APPWIDGET = "android.permission.BIND_KEYGUARD_APPWIDGET";
@@ -30,6 +29,7 @@ package android { 
    field public static final java.lang.String BIND_RESOLVER_RANKER_SERVICE = "android.permission.BIND_RESOLVER_RANKER_SERVICE";

    field public static final java.lang.String BIND_RUNTIME_PERMISSION_PRESENTER_SERVICE = "android.permission.BIND_RUNTIME_PERMISSION_PRESENTER_SERVICE";

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

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

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

    field public static final java.lang.String BIND_TRUST_AGENT = "android.permission.BIND_TRUST_AGENT";

    field public static final java.lang.String BIND_TV_REMOTE_SERVICE = "android.permission.BIND_TV_REMOTE_SERVICE";

core/res/AndroidManifest.xml

+4 −4
Original line number Diff line number Diff line
@@ -1792,14 +1792,14 @@ 
    <permission android:name="android.permission.BIND_IMS_SERVICE"

        android:protectionLevel="signature|privileged|vendorPrivileged" />



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

    <!-- Must be required by a telephony data service to ensure that only the

         system can bind to it.

         <p>Protection level: signature|privileged|vendorPrivileged

         <p>Protection level: signature

         @SystemApi

         @hide

    -->

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

        android:protectionLevel="signature|privileged|vendorPrivileged" />

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

        android:protectionLevel="signature" />



    <!-- Allows an application to manage embedded subscriptions (those on a eUICC) through

         EuiccManager APIs.

data/etc/privapp-permissions-platform.xml

+1 −0
Original line number Diff line number Diff line
@@ -145,6 +145,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_IMS_SERVICE"/>

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

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

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

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