Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Explicitly start device lock system service." into udc-qpr-dev

Browse Source
This commit is contained in:
Amos Bianchi
2023-07-12 20:30:21 +00:00
committed by Android (Google) Code Review
parent d2b57db8d4 3ee07a732c
commit 68cc7b8eee
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/java/com/android/server/SystemServer.java
View File

@@ -434,6 +434,10 @@ public final class SystemServer implements Dumpable {
+ "OnDevicePersonalizationSystemService$Lifecycle";
private static final String UPDATABLE_DEVICE_CONFIG_SERVICE_CLASS =
"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";
@@ -2864,6 +2868,13 @@ public final class SystemServer implements Dumpable {
mSystemServiceManager.startService(HEALTHCONNECT_MANAGER_SERVICE_CLASS);
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.
final NetworkManagementService networkManagementF = networkManagement;
final NetworkPolicyManagerService networkPolicyF = networkPolicy;