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

Commit d259d8b8 authored by Hall Liu's avatar Hall Liu Committed by Android (Google) Code Review
Browse files

Merge "Hide the SEND_EMBMS_INTENTS permission" into oc-mr1-dev

parents c71be69f 14f52d9e

api/current.txt

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

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

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

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

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

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

    field public static final java.lang.String SET_ALARM = "com.android.alarm.permission.SET_ALARM";

api/system-current.txt

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

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

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

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

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

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

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

api/test-current.txt

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

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

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

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

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

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

    field public static final java.lang.String SET_ALARM = "com.android.alarm.permission.SET_ALARM";

core/res/AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -1700,7 +1700,8 @@ 
    <permission android:name="android.permission.RECEIVE_STK_COMMANDS"

        android:protectionLevel="signature|privileged" />



    <!-- Allows an application to send EMBMS download intents to apps-->

      <!-- Allows an application to send EMBMS download intents to apps

           @hide -->

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

        android:protectionLevel="signature|privileged" />