diff options
| author | 2024-12-04 18:47:34 +0000 | |
|---|---|---|
| committer | 2024-12-04 18:47:34 +0000 | |
| commit | 0797aec73cdbf32ca3825e06b52b02e31cb6526c (patch) | |
| tree | bcc7774702908d0dd1377816ec8e8db407db4501 | |
| parent | 5b0578f7dc1628125dd5aae53a230f23a8b63a16 (diff) | |
| parent | af939e9ed5d00a47e0bb5fa297abfa6a12a93627 (diff) | |
Merge "Resolve change in getService return type" into main am: 219b26d32e am: af939e9ed5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3383874
Change-Id: If7e39d05151e7c79e70b55b1b6f9a65679a67c73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/os/ServiceManager.java | 6 | ||||
| -rw-r--r-- | core/java/android/os/ServiceManagerNative.java | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/core/java/android/os/ServiceManager.java b/core/java/android/os/ServiceManager.java index 8aec7eb59e91..9085fe09bdaa 100644 --- a/core/java/android/os/ServiceManager.java +++ b/core/java/android/os/ServiceManager.java @@ -277,7 +277,8 @@ public final class ServiceManager { if (service != null) { return service; } else { - return Binder.allowBlocking(getIServiceManager().checkService(name).getBinder()); + return Binder.allowBlocking( + getIServiceManager().checkService(name).getServiceWithMetadata().service); } } catch (RemoteException e) { Log.e(TAG, "error in checkService", e); @@ -425,7 +426,8 @@ public final class ServiceManager { private static IBinder rawGetService(String name) throws RemoteException { final long start = sStatLogger.getTime(); - final IBinder binder = getIServiceManager().getService2(name).getBinder(); + final IBinder binder = + getIServiceManager().getService2(name).getServiceWithMetadata().service; final int time = (int) sStatLogger.logDurationStat(Stats.GET_SERVICE, start); diff --git a/core/java/android/os/ServiceManagerNative.java b/core/java/android/os/ServiceManagerNative.java index 5a9c8787ee3b..49b696d95723 100644 --- a/core/java/android/os/ServiceManagerNative.java +++ b/core/java/android/os/ServiceManagerNative.java @@ -61,7 +61,7 @@ class ServiceManagerProxy implements IServiceManager { @UnsupportedAppUsage public IBinder getService(String name) throws RemoteException { // Same as checkService (old versions of servicemanager had both methods). - return checkService(name).getBinder(); + return checkService(name).getServiceWithMetadata().service; } public Service getService2(String name) throws RemoteException { |