diff options
| author | 2023-04-18 17:47:14 +0000 | |
|---|---|---|
| committer | 2023-04-18 17:47:26 +0000 | |
| commit | f7e90c28f17fe66878b7efb4d4521f7ca08b13fd (patch) | |
| tree | d6eeee6859bd8a94688be3b700130bef519af672 | |
| parent | f140a32948efde092c5aafa39f8723b2116421d7 (diff) | |
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
| -rw-r--r-- | core/java/android/app/AppOpsManager.java | 2 | ||||
| -rw-r--r-- | 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 282735b5afd2..9bf9e0c8eec3 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 7c7a211fb1a1..b73623031dc1 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 --> |