summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Andrei Onea <andreionea@google.com> 2019-11-01 16:02:05 -0700
committer android-build-merger <android-build-merger@google.com> 2019-11-01 16:02:05 -0700
commit8579ddfb2361b2543f414e9d0de511ec8c28893e (patch)
treee2bdeeabcd7515745feb886f691acce45edad6d4
parent86bb28e1b3abd8c7990884ca089e26bfd50cbf31 (diff)
parent2773409cac2a92ab4df659760df2f1df70a3fd6c (diff)
Merge "Initialize AppCompatCallbacks in system server"
am: 2773409cac Change-Id: I493671298a3a976e45542f7c192b7f7861ba6be0
-rw-r--r--services/java/com/android/server/SystemServer.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index b2c9e593c0dc..80535e496fbc 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -25,6 +25,7 @@ import static android.view.Display.DEFAULT_DISPLAY;
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 @@ public final class SystemServer {
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