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

Commit 5a7f703b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "art-module-service-manager" 

* changes:
  Revert "Expose ServiceManager.waitForService as system API."
  Register ArtModuleServiceManager on system server initialization.
parents 266adbb2 c39c0be8

core/api/module-lib-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -360,7 +360,6 @@ package android.os { 
    method @NonNull public static String[] getDeclaredInstances(@NonNull String);

    method public static boolean isDeclared(@NonNull String);

    method @Nullable public static android.os.IBinder waitForDeclaredService(@NonNull String);

    method @Nullable public static android.os.IBinder waitForService(@NonNull String);

  }



  public class StatsServiceManager {

core/java/android/os/ServiceManager.java

+0 −2
Original line number Diff line number Diff line
@@ -278,8 +278,6 @@ public final class ServiceManager { 
     * @return {@code null} only if there are permission problems or fatal errors.

     * @hide

     */

    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

    @Nullable

    public static IBinder waitForService(@NonNull String name) {

        return Binder.allowBlocking(waitForServiceNative(name));

    }

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

+3 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ import android.hardware.display.DisplayManagerInternal; 
import android.net.ConnectivityManager;

import android.net.ConnectivityModuleConnector;

import android.net.NetworkStackClient;

import android.os.ArtModuleServiceManager;

import android.os.BaseBundle;

import android.os.Binder;

import android.os.Build;
@@ -108,6 +109,7 @@ import com.android.server.am.ActivityManagerService; 
import com.android.server.ambientcontext.AmbientContextManagerService;

import com.android.server.appbinding.AppBindingService;

import com.android.server.art.ArtManagerLocal;

import com.android.server.art.ArtModuleServiceInitializer;

import com.android.server.attention.AttentionManagerService;

import com.android.server.audio.AudioService;

import com.android.server.biometrics.AuthService;
@@ -2723,6 +2725,7 @@ public final class SystemServer implements Dumpable { 
        t.traceEnd();



        t.traceBegin("ArtManagerLocal");

        ArtModuleServiceInitializer.setArtModuleServiceManager(new ArtModuleServiceManager());

        LocalManagerRegistry.addManager(ArtManagerLocal.class, new ArtManagerLocal(context));

        t.traceEnd();