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

Commit 59a79788 authored by Amos Bianchi's avatar Amos Bianchi Committed by Automerger Merge Worker
Browse files

Merge "Explicitly start device lock system service." into udc-qpr-dev am: 68cc7b8e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24025088



Change-Id: I9b42eec417bd42088887b21b9812fcd7367c2783
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 56dc51d1 68cc7b8e

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

+11 −0
Original line number Original line Diff line number Diff line
@@ -434,6 +434,10 @@ public final class SystemServer implements Dumpable { 
                    + "OnDevicePersonalizationSystemService$Lifecycle";

                    + "OnDevicePersonalizationSystemService$Lifecycle";

    private static final String UPDATABLE_DEVICE_CONFIG_SERVICE_CLASS =

    private static final String UPDATABLE_DEVICE_CONFIG_SERVICE_CLASS =

            "com.android.server.deviceconfig.DeviceConfigInit$Lifecycle";

            "com.android.server.deviceconfig.DeviceConfigInit$Lifecycle";

    private static final String DEVICE_LOCK_SERVICE_CLASS =

            "com.android.server.devicelock.DeviceLockService";

    private static final String DEVICE_LOCK_APEX_PATH =

            "/apex/com.android.devicelock/javalib/service-devicelock.jar";





    private static final String TETHERING_CONNECTOR_CLASS = "android.net.ITetheringConnector";

    private static final String TETHERING_CONNECTOR_CLASS = "android.net.ITetheringConnector";
@@ -2867,6 +2871,13 @@ public final class SystemServer implements Dumpable { 
        mSystemServiceManager.startService(HEALTHCONNECT_MANAGER_SERVICE_CLASS);

        mSystemServiceManager.startService(HEALTHCONNECT_MANAGER_SERVICE_CLASS);

        t.traceEnd();

        t.traceEnd();





        if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_DEVICE_LOCK)) {

            t.traceBegin("DeviceLockService");

            mSystemServiceManager.startServiceFromJar(DEVICE_LOCK_SERVICE_CLASS,

                    DEVICE_LOCK_APEX_PATH);

            t.traceEnd();

        }



        // These are needed to propagate to the runnable below.

        // These are needed to propagate to the runnable below.

        final NetworkManagementService networkManagementF = networkManagement;

        final NetworkManagementService networkManagementF = networkManagement;

        final NetworkPolicyManagerService networkPolicyF = networkPolicy;

        final NetworkPolicyManagerService networkPolicyF = networkPolicy;