summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2023-09-14 14:09:01 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2023-09-14 14:09:01 +0000
commit3cc0f825fe8c99dcc6a9e42f9dcd75923cf41bb9 (patch)
tree453e086061e96d51d40eb5c15dd55f5ea51da240
parent5effed6cda4c2b5859b9dac636ea914ec4debf1d (diff)
parent577c9c862ae49c81aa54f25ddbcb334c0e240ddf (diff)
Merge "isDeclared handles SecurityException as well" into main
-rw-r--r--core/java/android/os/ServiceManager.java2
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;
}