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

Commit c0442d5b authored by Anna Trostanetski's avatar Anna Trostanetski Committed by Gerrit Code Review
Browse files

Merge "Start platform compat service eariler."

parents 3878f501 499d4bff

core/java/android/content/Context.java

+9 −0
Original line number Diff line number Diff line
@@ -37,6 +37,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;
@@ -3064,6 +3065,7 @@ public abstract class Context { 
            RESTRICTIONS_SERVICE,

            APP_OPS_SERVICE,

            CAMERA_SERVICE,

            //@hide: PLATFORM_COMPAT_SERVICE,

            PRINT_SERVICE,

            CONSUMER_IR_SERVICE,

            //@hide: TRUST_SERVICE,
@@ -4225,6 +4227,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
@@ -562,6 +562,13 @@ public final class SystemServer { 
        SystemServerInitThreadPool.get().submit(SystemConfig::getInstance, TAG_SYSTEM_CONFIG);

        traceEnd();



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

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

        traceBeginAndSlog("PlatformCompat");

        ServiceManager.addService(Context.PLATFORM_COMPAT_SERVICE,

                new PlatformCompat(mSystemContext));

        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.
@@ -977,10 +984,6 @@ public final class SystemServer { 
            mSystemServiceManager.startService(PinnerService.class);

            traceEnd();



            traceBeginAndSlog("PlatformCompat");

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

            traceEnd();



        } catch (RuntimeException e) {

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

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