summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Andrei-Valentin Onea <andreionea@google.com> 2019-10-31 18:34:37 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-10-31 18:34:37 +0000
commit898cf42c2a4adce2193b6e83931cd7b0979f9da7 (patch)
treea47161693e2d8b44687f898396c6d756f6fca5aa
parent20277b830969c6241b2d7f7b993ab87272a7fcbe (diff)
parentf965d151cc4ddcc7c343b048e4493d011d379644 (diff)
Merge "Initialize AppCompatCallbacks in system server"
-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 58830487a0fe..c16f3e8d08da 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -27,6 +27,7 @@ import static com.android.server.utils.TimingsTraceAndSlog.SYSTEM_SERVER_TIMING_
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]);
t.traceEnd();
// Wait for installd to finish starting up so that it has a chance to