diff options
| author | 2023-09-14 17:57:04 +0000 | |
|---|---|---|
| committer | 2023-09-14 17:57:04 +0000 | |
| commit | 5de230fede25fa0e75266e742e856f00a2f6424b (patch) | |
| tree | a9067b4df73fa6f8fe12d719ac1231e8e18feafa | |
| parent | d8ac1c61da8524a302f1ef0d103bba5af7faad25 (diff) | |
| parent | 44caaea34a46a4af50970d75da0bf8f88a786998 (diff) | |
Merge "isDeclared handles SecurityException as well" into main am: 3cc0f825fe am: b06664514a am: fabc31f004 am: 44caaea34a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2749962
Change-Id: Ia28251468b43b2818e63d326fb57eec70510d698
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; } |