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

Commit 991b09c6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[Thread] add permission MANAGE_DEVICE_POLICY_THREAD_NETWORK" into main am: 27fa3efd 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2902427



Change-Id: Ic9149284ca25d293daab839f8fcace07b7955a5d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4d2a5b38 27fa3efd

core/api/current.txt

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

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

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

    field @FlaggedApi("com.android.net.thread.flags.thread_user_restriction_enabled") public static final String MANAGE_DEVICE_POLICY_THREAD_NETWORK = "android.permission.MANAGE_DEVICE_POLICY_THREAD_NETWORK";

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

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

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

core/res/AndroidManifest.xml

+7 −0
Original line number Diff line number Diff line
@@ -3522,6 +3522,13 @@ 
    <permission android:name="android.permission.MANAGE_DEVICE_POLICY_NEARBY_COMMUNICATION"

                android:protectionLevel="internal|role" />



    <!-- Allows an application to set policy related to <a

    href="https://www.threadgroup.org">Thread</a> network.

        @FlaggedApi("com.android.net.thread.flags.thread_user_restriction_enabled")

    -->

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

                android:protectionLevel="internal|role" />



    <!-- Allows an application to set policy related to windows.

        <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is

        required to call APIs protected by this permission on users different to the calling user.