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

Commit d580bcf7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Gating authentication policy service and secure lockdown service" into main

parents c49fc496 f1857231

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

+11 −9
Original line number Diff line number Diff line
@@ -2714,6 +2714,7 @@ public final class SystemServer implements Dumpable { 
            mSystemServiceManager.startService(AuthService.class);

            t.traceEnd();



            if (!isWatch && !isTv && !isAutomotive) {

                if (android.security.Flags.secureLockdown()) {

                    t.traceBegin("StartSecureLockDeviceService.Lifecycle");

                    mSystemServiceManager.startService(SecureLockDeviceService.Lifecycle.class);
@@ -2725,6 +2726,7 @@ public final class SystemServer implements Dumpable { 
                    mSystemServiceManager.startService(AuthenticationPolicyService.class);

                    t.traceEnd();

                }

            }



            if (!isWatch) {

                // We don't run this on watches as there are no plans to use the data logged