From f140a32948efde092c5aafa39f8723b2116421d7 Mon Sep 17 00:00:00 2001
From: Philip Junker <philipjunker@google.com>
Date: Tue, 7 Mar 2023 19:07:14 +0100
Subject: [PATCH] Allow android.permission.TURN_SCREEN_ON for signature and
 privileged apps

Bug: 272053372
Test: manually installed app with permission
Test: atest SettingsRoboTests:TurnScreenOnDetailsTest
Test: atest SettingsRoboTests:TurnScreenOnSettingsTest
Change-Id: I7b34dc4ce304119c0540fd69c234aa7eef94940e
---
 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 9bf9e0c8eec34..282735b5afd26 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_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(),
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index b73623031dc1a..7c7a211fb1a1d 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="normal|appop" />
+        android:protectionLevel="signature|privileged|appop" />
 
     <!-- ==================================================== -->
     <!-- Permissions related to changing audio settings   -->