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

Commit 48efc85d authored by kholoud mohamed's avatar kholoud mohamed Committed by Automerger Merge Worker
Browse files

Add new permission PROVISION_DEMO_DEVICE am: 53a01ab1 

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

Change-Id: Ife27e597e7e2452d86b6702e56fd7470ae1d94b8
parents 0430c2b4 53a01ab1

core/api/system-current.txt

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

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

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

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

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

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

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

core/res/AndroidManifest.xml

+5 −1
Original line number Diff line number Diff line
@@ -2937,7 +2937,7 @@ 
    <!-- @SystemApi @hide Allows an application to set the profile owners and the device owner.

         This permission is not available to third party applications.-->

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

        android:protectionLevel="signature|role|setup"

        android:protectionLevel="signature|role"

        android:label="@string/permlab_manageProfileAndDeviceOwners"

        android:description="@string/permdesc_manageProfileAndDeviceOwners" />
@@ -2946,6 +2946,10 @@ 
    <permission android:name="android.permission.QUERY_ADMIN_POLICY"

                android:protectionLevel="signature|role" />



    <!-- @SystemApi @hide Allows an application to set a device owner on retail demo devices.-->

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

                android:protectionLevel="signature|setup" />



    <!-- @TestApi @hide Allows an application to reset the record of previous system update freeze

         periods. -->

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

packages/Shell/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -210,6 +210,7 @@ 
    <uses-permission android:name="android.permission.MANAGE_CREDENTIAL_MANAGEMENT_APP" />

    <uses-permission android:name="android.permission.MANAGE_DEVICE_ADMINS" />

    <uses-permission android:name="android.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS" />

    <uses-permission android:name="android.permission.PROVISION_DEMO_DEVICE" />

    <uses-permission android:name="android.permission.QUERY_ADMIN_POLICY" />

    <uses-permission android:name="android.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES" />

    <uses-permission android:name="android.permission.FORCE_DEVICE_POLICY_MANAGER_LOGS" />