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

Commit b28002cf authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Support getting RPC service in java ServiceManager" into main

parents 3db71622 cc513c74

core/java/android/os/ServiceManager.java

+2 −2
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ public final class ServiceManager { 
            if (service != null) {

                return service;

            } else {

                return Binder.allowBlocking(getIServiceManager().checkService(name));

                return Binder.allowBlocking(getIServiceManager().checkService(name).getBinder());

            }

        } catch (RemoteException e) {

            Log.e(TAG, "error in checkService", e);
@@ -425,7 +425,7 @@ public final class ServiceManager { 
    private static IBinder rawGetService(String name) throws RemoteException {

        final long start = sStatLogger.getTime();



        final IBinder binder = getIServiceManager().getService(name);

        final IBinder binder = getIServiceManager().getService(name).getBinder();



        final int time = (int) sStatLogger.logDurationStat(Stats.GET_SERVICE, start);

core/java/android/os/ServiceManagerNative.java

+3 −3
Original line number Diff line number Diff line
@@ -58,12 +58,12 @@ class ServiceManagerProxy implements IServiceManager { 
    }



    @UnsupportedAppUsage

    public IBinder getService(String name) throws RemoteException {

    public Service getService(String name) throws RemoteException {

        // Same as checkService (old versions of servicemanager had both methods).

        return mServiceManager.checkService(name);

        return checkService(name);

    }



    public IBinder checkService(String name) throws RemoteException {

    public Service checkService(String name) throws RemoteException {

        return mServiceManager.checkService(name);

    }