diff options
| author | 2023-04-18 15:36:55 +0000 | |
|---|---|---|
| committer | 2023-04-18 15:36:55 +0000 | |
| commit | c96f616245c9ddb992b2c150f6d0b1e153de2559 (patch) | |
| tree | 6b6f7185dbdf8d80bb291c339f24ef7bfb7cf1b0 | |
| parent | 68b4e7231a62180bc23ee90906af5ba7ca8d1626 (diff) | |
| parent | f140a32948efde092c5aafa39f8723b2116421d7 (diff) | |
Merge "Allow android.permission.TURN_SCREEN_ON for signature and privileged apps" 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 3312294865d6..9e59ee496de1 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_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 e62477f0dbe3..1e18a98853bd 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="normal|appop" /> + android:protectionLevel="signature|privileged|appop" /> <!-- ==================================================== --> <!-- Permissions related to changing audio settings --> |