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

Commit ad2db050 authored by Philip Junker's avatar Philip Junker Committed by Automerger Merge Worker
Browse files

Merge "Allow android.permission.TURN_SCREEN_ON for signature and privileged... 

Merge "Allow android.permission.TURN_SCREEN_ON for signature and privileged apps" into udc-dev am: bc5bb19b

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



Change-Id: I1dda14433cfc884d8e9118f241775db953841ea8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ade71a19 bc5bb19b

core/java/android/app/AppOpsManager.java

+1 −1
Original line number Diff line number Diff line
@@ -2547,7 +2547,7 @@ public class AppOpsManager { 
            .setDefaultMode(AppOpsManager.MODE_ALLOWED).build(),

        new AppOpInfo.Builder(OP_TURN_SCREEN_ON, OPSTR_TURN_SCREEN_ON, "TURN_SCREEN_ON")

            .setPermission(Manifest.permission.TURN_SCREEN_ON)

            .setDefaultMode(AppOpsManager.MODE_ERRORED).build(),

            .setDefaultMode(AppOpsManager.MODE_DEFAULT).build(),

        new AppOpInfo.Builder(OP_GET_ACCOUNTS, OPSTR_GET_ACCOUNTS, "GET_ACCOUNTS")

            .setPermission(Manifest.permission.GET_ACCOUNTS)

            .setDefaultMode(AppOpsManager.MODE_ALLOWED).build(),

core/res/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -2542,7 +2542,7 @@ 
    <permission android:name="android.permission.TURN_SCREEN_ON"

        android:label="@string/permlab_turnScreenOn"

        android:description="@string/permdesc_turnScreenOn"

        android:protectionLevel="normal|appop" />

        android:protectionLevel="signature|privileged|appop" />



    <!-- ==================================================== -->

    <!-- Permissions related to changing audio settings   -->