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

Commit 41995621 authored by Hall Liu's avatar Hall Liu Committed by Gerrit Code Review
Browse files

Merge "Add NETWORK_SCAN permission"

parents 507d69d5 69d4d8b1

api/system-current.txt

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

    field public static final String MODIFY_QUIET_MODE = "android.permission.MODIFY_QUIET_MODE";

    field public static final String MOVE_PACKAGE = "android.permission.MOVE_PACKAGE";

    field public static final String NETWORK_SCAN = "android.permission.NETWORK_SCAN";

    field public static final String NETWORK_SETUP_WIZARD = "android.permission.NETWORK_SETUP_WIZARD";

    field public static final String NOTIFICATION_DURING_SETUP = "android.permission.NOTIFICATION_DURING_SETUP";

    field public static final String NOTIFY_TV_INPUTS = "android.permission.NOTIFY_TV_INPUTS";

core/res/AndroidManifest.xml

+6 −0
Original line number Diff line number Diff line
@@ -1829,6 +1829,12 @@ 
    <permission android:name="android.permission.BIND_INCALL_SERVICE"

        android:protectionLevel="signature|privileged" />



    <!-- Allows the app to request network scans from telephony.

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

         @SystemApi @hide-->

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

        android:protectionLevel="signature|privileged" />



    <!-- Must be required by a link {@link android.telephony.VisualVoicemailService} to ensure that

         only the system can bind to it.

         <p>Protection level: signature|privileged