diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 7602f697fcf3a..f63f8b3c7af8d 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -198,6 +198,9 @@ service. Off by default, since the service may not be available on some devices. --> false + + true + true diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 978849d8bde06..8e52633c83245 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -418,6 +418,7 @@ + diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index ee4bc1237bcba..6a2d4dc333f6d 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -2447,8 +2447,9 @@ public final class SystemServer implements Dumpable { t.traceBegin("StartCompanionDeviceManager"); mSystemServiceManager.startService(COMPANION_DEVICE_MANAGER_SERVICE_CLASS); t.traceEnd(); + } - // VirtualDeviceManager depends on CDM to control the associations. + if (context.getResources().getBoolean(R.bool.config_enableVirtualDeviceManager)) { t.traceBegin("StartVirtualDeviceManager"); mSystemServiceManager.startService(VIRTUAL_DEVICE_MANAGER_SERVICE_CLASS); t.traceEnd();