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

Commit 4e564762 authored by Amit Mahajan's avatar Amit Mahajan Committed by Android (Google) Code Review
Browse files

Merge "Make permission RECEIVE_EMERGENCY_BROADCAST public."

parents c2eadff3 45d9b36f

api/current.txt

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

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

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

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

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

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

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

api/test-current.txt

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

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

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

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

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

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

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

core/res/AndroidManifest.xml

+1 −2
Original line number Diff line number Diff line
@@ -968,8 +968,7 @@ 


    <!-- @SystemApi Allows an application to receive emergency cell broadcast messages,

         to record or display them to the user.

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

         @hide Pending API council approval -->

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

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

        android:protectionLevel="signature|privileged" />