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

Commit 81c4fd80 authored by Vikram Gaur's avatar Vikram Gaur Committed by Gerrit Code Review
Browse files

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

parents 4c6f715b 81a458a7

core/api/module-lib-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -348,6 +348,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);

  }

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

        }

    }