Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b4b4fe5e authored by Andrei Onea's avatar Andrei Onea Committed by android-build-merger
Browse files

Merge "Initialize AppCompatCallbacks in system server" am: 2773409c 

am: 8579ddfb

Change-Id: I7be68b5fa9c1bf9b95722b35b322845a966e565f
parents 9b3c4c14 8579ddfb

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

+2 −0
Original line number Diff line number Diff line
@@ -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