Merge "Add service for applying per-app compat overrides delivered via Device Config." into sc-v2-dev am: b51de11ce9

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

Change-Id: I38795ff17ea2fc5747aec5fbefccb6cbf8e3d315
This commit is contained in:
Tom Natan
2021-07-12 20:20:03 +00:00
committed by Automerger Merge Worker
6 changed files with 1362 additions and 0 deletions

View File

@@ -378,6 +378,8 @@ public final class SystemServer implements Dumpable {
"com.android.server.connectivity.IpConnectivityMetrics";
private static final String MEDIA_COMMUNICATION_SERVICE_CLASS =
"com.android.server.media.MediaCommunicationService";
private static final String APP_COMPAT_OVERRIDES_SERVICE_CLASS =
"com.android.server.compat.overrides.AppCompatOverridesService$Lifecycle";
private static final String ROLE_SERVICE_CLASS = "com.android.role.RoleService";
private static final String GAME_MANAGER_SERVICE_CLASS =
@@ -2655,6 +2657,10 @@ public final class SystemServer implements Dumpable {
mSystemServiceManager.startService(MEDIA_COMMUNICATION_SERVICE_CLASS);
t.traceEnd();
t.traceBegin("AppCompatOverridesService");
mSystemServiceManager.startService(APP_COMPAT_OVERRIDES_SERVICE_CLASS);
t.traceEnd();
ConcurrentUtils.waitForFutureNoInterrupt(mBlobStoreServiceStart,
START_BLOB_STORE_SERVICE);