diff options
| author | 2023-09-14 16:05:05 +0000 | |
|---|---|---|
| committer | 2023-09-14 16:05:05 +0000 | |
| commit | fabc31f004e0c68d9ecaddff31903392d301792c (patch) | |
| tree | 722b0dc6c4e252428a16329eefb03a725b4d70ab | |
| parent | 06c5bddba13af5b79404a07b5f83512668a147aa (diff) | |
| parent | b06664514afd3cca1900d3aaa074d8b3097e93b2 (diff) | |
Merge "isDeclared handles SecurityException as well" into main am: 3cc0f825fe am: b06664514a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2749962
Change-Id: Ib93009ffbed019bb5bffb82c9e3a0535eb5d09a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/os/ServiceManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/os/ServiceManager.java b/core/java/android/os/ServiceManager.java index b210c4644d7d..e96c24d677f1 100644 --- a/core/java/android/os/ServiceManager.java +++ b/core/java/android/os/ServiceManager.java @@ -245,7 +245,7 @@ public final class ServiceManager { public static boolean isDeclared(@NonNull String name) { try { return getIServiceManager().isDeclared(name); - } catch (RemoteException e) { + } catch (RemoteException | SecurityException e) { Log.e(TAG, "error in isDeclared", e); return false; } |