diff options
| author | 2023-04-18 19:36:45 +0000 | |
|---|---|---|
| committer | 2023-04-18 19:36:45 +0000 | |
| commit | c1b615d805b51c106edf7596f0abbff781958585 (patch) | |
| tree | 8e73c2e5086568edc847eece8edda6030a3eb985 | |
| parent | 5541e3bc19a201ff2e1f0676aea1b6c1ab370b00 (diff) | |
| parent | f7e90c28f17fe66878b7efb4d4521f7ca08b13fd (diff) | |
Merge "Revert "Allow android.permission.TURN_SCREEN_ON for signature an..."" into udc-dev
| -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 9e59ee496de1..3312294865d6 100644 --- a/core/java/android/app/AppOpsManager.java +++ b/core/java/android/app/AppOpsManager.java @@ -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_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 c928a82de32e..f6c9fabb7896 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -2542,7 +2542,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 --> |