summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-12-26 12:10:17 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2024-12-26 12:10:17 -0800
commitb4838c7cea48eb17c67bb30c7713fa51842f6c35 (patch)
tree99c4aa66810e76be89d812881b26b6306087ab1a
parent381625d95f575c32ee5b675af77b7c6d7c9676b7 (diff)
parentcde82783e51798154331055fb45dbde62f4fcd32 (diff)
Merge "[Bugfix]Avoid device reboot caused by SecurityException." into main
-rw-r--r--services/core/java/com/android/server/am/ContentProviderHelper.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/ContentProviderHelper.java b/services/core/java/com/android/server/am/ContentProviderHelper.java
index da408266bfac..f72fdf84446b 100644
--- a/services/core/java/com/android/server/am/ContentProviderHelper.java
+++ b/services/core/java/com/android/server/am/ContentProviderHelper.java
@@ -1433,7 +1433,7 @@ public class ContentProviderHelper {
}
}
}
- } catch (RemoteException ignored) {
+ } catch (RemoteException|SecurityException ignored) {
}
});
}