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

Commit 7433255e authored by Anna Trostanetski's avatar Anna Trostanetski Committed by Android (Google) Code Review
Browse files

Merge "Start platform compat service eariler."

parents 4eb3ed86 de54a8ac

core/java/android/content/Context.java

+9 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import android.app.ActivityManager; 
import android.app.IApplicationThread;

import android.app.IServiceConnection;

import android.app.VrManager;

import android.compat.IPlatformCompat;

import android.content.pm.ApplicationInfo;

import android.content.pm.PackageManager;

import android.content.res.AssetManager;
@@ -3228,6 +3229,7 @@ public abstract class Context { 
            ROLE_SERVICE,

            //@hide ROLE_CONTROLLER_SERVICE,

            CAMERA_SERVICE,

            //@hide: PLATFORM_COMPAT_SERVICE,

            PRINT_SERVICE,

            CONSUMER_IR_SERVICE,

            //@hide: TRUST_SERVICE,
@@ -4596,6 +4598,13 @@ public abstract class Context { 
    @SystemApi

    public static final String STATS_MANAGER = "stats";



    /**

     * Use with {@link android.os.ServiceManager.getService()} to retrieve a

     * {@link IPlatformCompat} IBinder for communicating with the platform compat service.

     * @hide

     */

    public static final String PLATFORM_COMPAT_SERVICE = "platform_compat";



    /**

     * Service to capture a bugreport.

     * @see #getSystemService(String)

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

+7 −4
Original line number Diff line number Diff line
@@ -635,6 +635,13 @@ public final class SystemServer { 
        SystemServerInitThreadPool.get().submit(SystemConfig::getInstance, TAG_SYSTEM_CONFIG);

        t.traceEnd();



        // Platform compat service is used by ActivityManagerService, PackageManagerService, and

        // possibly others in the future. b/135010838.

        t.traceBegin("PlatformCompat");

        ServiceManager.addService(Context.PLATFORM_COMPAT_SERVICE,

                new PlatformCompat(mSystemContext));

        t.traceEnd();



        // Wait for installd to finish starting up so that it has a chance to

        // create critical directories such as /data/user with the appropriate

        // permissions.  We need this to complete before we initialize other services.
@@ -1102,10 +1109,6 @@ public final class SystemServer { 
            SignedConfigService.registerUpdateReceiver(mSystemContext);

            t.traceEnd();



            t.traceBegin("PlatformCompat");

            ServiceManager.addService("platform_compat", new PlatformCompat(context));

            t.traceEnd();



        } catch (RuntimeException e) {

            Slog.e("System", "******************************************");

            Slog.e("System", "************ Failure starting core service", e);