commit b4b4fe5e66bf90328c8aa5a4cdacf9a17ff8fc7b
author Andrei Onea <andreionea@google.com> Fri Nov 01 16:13:32 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Nov 01 16:13:32 2019 -0700
tree 8f45d531ac625642a0231ab612b7665fbbf8e837
parent 9b3c4c1484354d5244597e51340a078db2645df5
parent 8579ddfb2361b2543f414e9d0de511ec8c28893e

Merge "Initialize AppCompatCallbacks in system server" am: 2773409cac
am: 8579ddfb23

Change-Id: I7be68b5fa9c1bf9b95722b35b322845a966e565f

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

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index b2c9e59..80535e4 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -25,6 +25,7 @@
 import android.annotation.NonNull;
 import android.annotation.StringRes;
 import android.app.ActivityThread;
+import android.app.AppCompatCallbacks;
 import android.app.INotificationManager;
 import android.app.usage.UsageStatsManagerInternal;
 import android.content.ComponentName;
@@ -646,6 +647,7 @@
         ServiceManager.addService(Context.PLATFORM_COMPAT_SERVICE, platformCompat);
         ServiceManager.addService(Context.PLATFORM_COMPAT_NATIVE_SERVICE,
                 new PlatformCompatNative(platformCompat));
+        AppCompatCallbacks.install(new long[0]);
         traceEnd();
 
         // Wait for installd to finish starting up so that it has a chance to