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

Commit bcbdfbb5 authored by Amit Mahajan's avatar Amit Mahajan Committed by android-build-merger
Browse files

Merge "New permission for bypassing premium short code check." into nyc-dev 

am: 0f90653c

* commit '0f90653c':
  New permission for bypassing premium short code check.
parents e2766b65 0f90653c

api/current.txt

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

    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";

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

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

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

api/system-current.txt

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

    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";

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

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

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

api/test-current.txt

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

    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";

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

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

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

core/res/AndroidManifest.xml

+6 −1
Original line number Diff line number Diff line
@@ -984,6 +984,11 @@ 
    <permission android:name="android.permission.SEND_RESPOND_VIA_MESSAGE"

        android:protectionLevel="signature|privileged" />



    <!-- @SystemApi Allows an application to send SMS to premium shortcodes without user permission.

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

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

        android:protectionLevel="signature|privileged" />



    <!-- Allows an application to filter carrier specific sms.

         @hide -->

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