summaryrefslogtreecommitdiff
path: root/services/java
diff options
context:
space:
mode:
authorMaurice Lam <yukl@google.com>2021-08-04 20:23:41 -0700
committerMaurice Lam <yukl@google.com>2021-10-26 20:41:00 -0700
commit771c72a607caa96016d93ea6eb7e53ae2bfdfa83 (patch)
treef1484c06b16f5d6552436baa6ed9a31e7effa57e /services/java
parentbbd05d765e4bd5bc22baf74c5c087048d4b2ca8b (diff)
Create VirtualDeviceManager
CTS-Coverage-Bug: 194949534 Bug: 194949534 Test: ag/15781910 Change-Id: I06d245d91827390de99b9ff3e514af4294a11476
Diffstat (limited to 'services/java')
-rw-r--r--services/java/com/android/server/SystemServer.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index f351a8c8922f..ce03b59bc3f5 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -251,6 +251,8 @@ public final class SystemServer implements Dumpable {
"com.android.server.print.PrintManagerService";
private static final String COMPANION_DEVICE_MANAGER_SERVICE_CLASS =
"com.android.server.companion.CompanionDeviceManagerService";
+ private static final String VIRTUAL_DEVICE_MANAGER_SERVICE_CLASS =
+ "com.android.server.companion.virtual.VirtualDeviceManagerService";
private static final String STATS_COMPANION_APEX_PATH =
"/apex/com.android.os.statsd/javalib/service-statsd.jar";
private static final String SCHEDULING_APEX_PATH =
@@ -2322,6 +2324,11 @@ 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.
+ t.traceBegin("StartVirtualDeviceManager");
+ mSystemServiceManager.startService(VIRTUAL_DEVICE_MANAGER_SERVICE_CLASS);
+ t.traceEnd();
}
t.traceBegin("StartRestrictionManager");