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

Commit 937307d5 authored Jul 22, 2024 by Treehugger Robot Committed by Automerger Merge Worker Jul 22, 2024

Merge "Support getting RPC service in java ServiceManager" into main am: b28002cf

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

Change-Id: I916fbb0e99e3060b374599c44eb4ee1738d7e61c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents c2d38ca2 b28002cf

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