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

Commit f7e90c28 authored by Liana Kazanova's avatar Liana Kazanova Committed by Android (Google) Code Review
Browse files

Revert "Allow android.permission.TURN_SCREEN_ON for signature an..." 

Revert submission 22338257-turnScreenOnPermission_pregrant

Reason for revert: b/278739832

Reverted changes: /q/submissionid:22338257-turnScreenOnPermission_pregrant

Change-Id: I09c4aa352c60f05541c63bc8cfa4b72282efd9c0
parent f140a329

core/java/android/app/AppOpsManager.java

+1 −1
Original line number Diff line number Diff line
@@ -2505,7 +2505,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_DEFAULT).build(),

            .setDefaultMode(AppOpsManager.MODE_ERRORED).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
@@ -2562,7 +2562,7 @@ 
    <permission android:name="android.permission.TURN_SCREEN_ON"

        android:label="@string/permlab_turnScreenOn"

        android:description="@string/permdesc_turnScreenOn"

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

        android:protectionLevel="normal|appop" />



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

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