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

Commit 6caed025 authored by Kholoud Mohamed's avatar Kholoud Mohamed Committed by Automerger Merge Worker
Browse files

Merge "created FORCE_DEVICE_POLICY_MANAGER_LOG and CLEAR_FREEZE_PERIOD" into sc-dev am: 9657d5d7 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I28b7db4bc3bff4d56335491af030f5876332d88e
parents 7ff3057d 9657d5d7

core/api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -10,9 +10,11 @@ package android { 
    field public static final String BROADCAST_CLOSE_SYSTEM_DIALOGS = "android.permission.BROADCAST_CLOSE_SYSTEM_DIALOGS";

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

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

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

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

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

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

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

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

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

    field @Deprecated public static final String MANAGE_ACTIVITY_STACKS = "android.permission.MANAGE_ACTIVITY_STACKS";

core/res/AndroidManifest.xml

+10 −0
Original line number Diff line number Diff line
@@ -2641,6 +2641,16 @@ 
        android:label="@string/permlab_manageProfileAndDeviceOwners"

        android:description="@string/permdesc_manageProfileAndDeviceOwners" />



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

         periods. -->

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

                android:protectionLevel="signature" />



    <!-- @TestApi @hide Allows an application to force available DevicePolicyManager logs to

         DPC. -->

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

                android:protectionLevel="signature" />



    <!-- Allows an application to get full detailed information about

         recently running tasks, with full fidelity to the real state.

         @hide -->

packages/Shell/AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -125,6 +125,8 @@ 
    <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.FORCE_DEVICE_POLICY_MANAGER_LOGS" />

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

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

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

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