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

Commit 82ccc593 authored by Roshan Pius's avatar Roshan Pius Committed by Android (Google) Code Review
Browse files

Merge "AndroidManifest.xml: Add new network permission for carrier provisioning"

parents 1279c3ff 831cbaa2

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -119,6 +119,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_CARRIER_PROVISIONING = "android.permission.NETWORK_CARRIER_PROVISIONING";

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

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

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

core/res/AndroidManifest.xml

+8 −0
Original line number Diff line number Diff line
@@ -1606,6 +1606,14 @@ 
    <permission android:name="android.permission.NETWORK_MANAGED_PROVISIONING"

        android:protectionLevel="signature" />



    <!-- Allows Carrier Provisioning to call methods in Networking services

         <p>Not for use by any other third-party or privileged applications.

         @SystemApi

         @hide This should only be used by CarrierProvisioning.

    -->

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

        android:protectionLevel="signature|privileged" />



    <!-- #SystemApi @hide Allows applications to access information about LoWPAN interfaces.

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

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