diff options
| author | 2024-03-13 18:13:43 +0000 | |
|---|---|---|
| committer | 2024-03-13 13:49:36 -0700 | |
| commit | d1a5f44bd398f44bc89b3c7b864dd34722685aa4 (patch) | |
| tree | 2b5b3195adcc8c5023ee3d0152198cb89d4efbca | |
| parent | 12f3dd35d7fdb7986fd6ecf9f953a55cad39d54b (diff) | |
[ECM] Use default mode of MODE_DEFAULT
OP_ACCESS_RESTRICTED_SETTINGS still defaults to MODE_ALLOWED.
Change it to default to MODE_DEFAULT.
Bug: 329442983
Test: atest EnhancedConfirmationManagerTest
Change-Id: I3d05d86899ac1edbf4f9d56f2a47a18bb083b277
| -rw-r--r-- | core/java/android/app/AppOpsManager.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java index 2afc78cb90e6..a8352fad8a90 100644 --- a/core/java/android/app/AppOpsManager.java +++ b/core/java/android/app/AppOpsManager.java @@ -2951,7 +2951,9 @@ public class AppOpsManager { new AppOpInfo.Builder(OP_ESTABLISH_VPN_MANAGER, OPSTR_ESTABLISH_VPN_MANAGER, "ESTABLISH_VPN_MANAGER").setDefaultMode(AppOpsManager.MODE_ALLOWED).build(), new AppOpInfo.Builder(OP_ACCESS_RESTRICTED_SETTINGS, OPSTR_ACCESS_RESTRICTED_SETTINGS, - "ACCESS_RESTRICTED_SETTINGS").setDefaultMode(AppOpsManager.MODE_ALLOWED) + "ACCESS_RESTRICTED_SETTINGS").setDefaultMode( + android.permission.flags.Flags.enhancedConfirmationModeApisEnabled() + ? MODE_DEFAULT : MODE_ALLOWED) .setDisableReset(true).setRestrictRead(true).build(), new AppOpInfo.Builder(OP_RECEIVE_AMBIENT_TRIGGER_AUDIO, OPSTR_RECEIVE_AMBIENT_TRIGGER_AUDIO, "RECEIVE_SOUNDTRIGGER_AUDIO").setDefaultMode(AppOpsManager.MODE_ALLOWED) |