Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02067869 authored by Jay Sullivan's avatar Jay Sullivan Committed by Android (Google) Code Review
Browse files

Merge "[ECM] Start EnhancedConfirmationService in SS" into main

parents 8c655d7a 0b97dd90

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

+9 −0
Original line number Diff line number Diff line
@@ -434,6 +434,9 @@ public final class SystemServer implements Dumpable { 
    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";
@@ -1593,6 +1596,12 @@ public final class SystemServer implements Dumpable { 
            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,