Merge "Enable additional ECM identifiers" into main

1 files changed, 5 insertions, 2 deletions

diff --git a/service/java/com/android/ecm/EnhancedConfirmationService.java b/service/java/com/android/ecm/EnhancedConfirmationService.java
index c5700f3ed..93db7551b 100644
--- a/service/java/com/android/ecm/EnhancedConfirmationService.java
+++ b/service/java/com/android/ecm/EnhancedConfirmationService.java
@@ -131,10 +131,15 @@ public class EnhancedConfirmationService extends SystemService {
             PROTECTED_SETTINGS.add(Manifest.permission.RECEIVE_MMS);
             PROTECTED_SETTINGS.add(Manifest.permission.RECEIVE_WAP_PUSH);
             PROTECTED_SETTINGS.add(Manifest.permission.READ_CELL_BROADCASTS);
+
+            PROTECTED_SETTINGS.add(Manifest.permission.BIND_DEVICE_ADMIN);
             // TODO(b/310654818): Add other explicitly protected runtime permissions
             // App ops
             PROTECTED_SETTINGS.add(AppOpsManager.OPSTR_BIND_ACCESSIBILITY_SERVICE);
             PROTECTED_SETTINGS.add(AppOpsManager.OPSTR_ACCESS_NOTIFICATIONS);
+            PROTECTED_SETTINGS.add(AppOpsManager.OPSTR_SYSTEM_ALERT_WINDOW);
+            PROTECTED_SETTINGS.add(AppOpsManager.OPSTR_GET_USAGE_STATS);
+            PROTECTED_SETTINGS.add(AppOpsManager.OPSTR_LOADER_USAGE_STATS);
             // Default application roles.
             PROTECTED_SETTINGS.add(RoleManager.ROLE_ASSISTANT);
             PROTECTED_SETTINGS.add(RoleManager.ROLE_BROWSER);
@@ -144,8 +149,6 @@ public class EnhancedConfirmationService extends SystemService {
             PROTECTED_SETTINGS.add(RoleManager.ROLE_HOME);
             PROTECTED_SETTINGS.add(RoleManager.ROLE_SMS);
             PROTECTED_SETTINGS.add(RoleManager.ROLE_WALLET);
-            // Other settings
-            PROTECTED_SETTINGS.add(AppOpsManager.OPSTR_BIND_ACCESSIBILITY_SERVICE);
             // TODO(b/310654015): Add other explicitly protected settings
         }