From f7e90c28f17fe66878b7efb4d4521f7ca08b13fd Mon Sep 17 00:00:00 2001
From: Liana Kazanova <lkazanova@google.com>
Date: Tue, 18 Apr 2023 17:47:14 +0000
Subject: [PATCH] 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
---
 core/java/android/app/AppOpsManager.java | 2 +-
 core/res/AndroidManifest.xml             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java
index 282735b5afd26..9bf9e0c8eec34 100644
--- a/core/java/android/app/AppOpsManager.java
+++ b/core/java/android/app/AppOpsManager.java
@@ -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(),
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 7c7a211fb1a1d..b73623031dc1a 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -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   -->