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

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

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

parents 8ef672a1 b4c45334

api/system-current.txt

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

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

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

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

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

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

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

core/res/AndroidManifest.xml

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

        android:protectionLevel="signature|setup" />



    <!-- Allows Managed 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 ManagedProvisioning app.

    -->

    <permission android:name="android.permission.NETWORK_MANAGED_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"

data/etc/privapp-permissions-platform.xml

+1 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ applications that come with the platform 
        <permission name="android.permission.MANAGE_DEVICE_ADMINS"/>

        <permission name="android.permission.MANAGE_USERS"/>

        <permission name="android.permission.MASTER_CLEAR"/>

        <permission name="android.permission.NETWORK_MANAGED_PROVISIONING"/>

        <permission name="android.permission.PERFORM_CDMA_PROVISIONING"/>

        <permission name="android.permission.SET_TIME"/>

        <permission name="android.permission.SET_TIME_ZONE"/>