commit 0b97dd90d69731d2cfff5b054a1291751aa2e26f
author Jay Thomas Sullivan <jaysullivan@google.com> Thu Jan 18 16:37:28 2024 -0800
committer Jay Thomas Sullivan <jaysullivan@google.com> Wed Jan 24 15:26:06 2024 -0800
tree 47b798e32a464f4f73f705de4adf406fbd302a2c
parent d6bdc801da041340a8ac0f2e1491fdb4fdb20b10

[ECM] Start EnhancedConfirmationService in SS

EnhancedConfirmationService is a new SystemService.

Start it. (In SystemServer, at boot.)

Bug: 321053639
Test: atest CtsPermissionUiTestCases:android.permissionui.cts.EnhancedConfirmationManagerTest
Change-Id: I606498bdd53f1f24fe8147fd35df20c185213694

services/java/com/android/server/SystemServer.java

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 86ad494..a605962 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -433,6 +433,9 @@
     private static final String ROLE_SERVICE_CLASS = "com.android.role.RoleService";
     private static final String GAME_MANAGER_SERVICE_CLASS =
             "com.android.server.app.GameManagerService$Lifecycle";
+    private static final String ENHANCED_CONFIRMATION_SERVICE_CLASS =
+            "com.android.ecm.EnhancedConfirmationService";
+
     private static final String UWB_APEX_SERVICE_JAR_PATH =
             "/apex/com.android.uwb/javalib/service-uwb.jar";
     private static final String UWB_SERVICE_CLASS = "com.android.server.uwb.UwbService";
@@ -1592,6 +1595,12 @@
             mSystemServiceManager.startService(DropBoxManagerService.class);
             t.traceEnd();
 
+            if (android.permission.flags.Flags.enhancedConfirmationModeApisEnabled()) {
+                t.traceBegin("StartEnhancedConfirmationService");
+                mSystemServiceManager.startService(ENHANCED_CONFIRMATION_SERVICE_CLASS);
+                t.traceEnd();
+            }
+
             // Grants default permissions and defines roles
             t.traceBegin("StartRoleManagerService");
             LocalManagerRegistry.addManager(RoleServicePlatformHelper.class,