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

Commit 0077f82b authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "ServiceManager APIs for Remote Key Provisioning mainline... 

Merge "Merge "ServiceManager APIs for Remote Key Provisioning mainline module." am: 81c4fd80 am: 0dda8157" into tm-qpr-dev-plus-aosp am: 3966b142

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2299820



Change-Id: Icf1bde247713c6b71f3f235d4598b6693ed416ed
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bc425d50 3966b142

core/api/module-lib-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -349,6 +349,7 @@ package android.os { 
  }



  public final class ServiceManager {

    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);

core/java/android/os/ServiceManager.java

+3 −1
Original line number Diff line number Diff line
@@ -258,12 +258,14 @@ public final class ServiceManager { 
     * waitForService should always be able to return the service.

     * @hide

     */

    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

    @NonNull

    public static String[] getDeclaredInstances(@NonNull String iface) {

        try {

            return getIServiceManager().getDeclaredInstances(iface);

        } catch (RemoteException e) {

            Log.e(TAG, "error in getDeclaredInstances", e);

            return null;

            throw e.rethrowFromSystemServer();

        }

    }