diff options
| author | 2022-11-14 21:09:08 +0000 | |
|---|---|---|
| committer | 2022-11-14 21:09:08 +0000 | |
| commit | 0dda81576cff39320a23f99bb332c588bb0357ba (patch) | |
| tree | 136122bf1089f4660ebcf1150e053a837eb23958 | |
| parent | 8e0b2b652568a126d7627304f467548ec1d94739 (diff) | |
| parent | 81c4fd80412d1e76d6f942fa9a12efbe6c52c404 (diff) | |
Merge "ServiceManager APIs for Remote Key Provisioning mainline module." am: 81c4fd8041
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2299820
Change-Id: Ifd1b61af5be088fcb6695110e73561f67a82052c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/api/module-lib-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/os/ServiceManager.java | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/core/api/module-lib-current.txt b/core/api/module-lib-current.txt index 068b40ad5270..ed2c8eba0ab2 100644 --- a/core/api/module-lib-current.txt +++ b/core/api/module-lib-current.txt @@ -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); } diff --git a/core/java/android/os/ServiceManager.java b/core/java/android/os/ServiceManager.java index ba5ed4360cd7..9ea42780981d 100644 --- a/core/java/android/os/ServiceManager.java +++ b/core/java/android/os/ServiceManager.java @@ -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(); } } |