commit b4838c7cea48eb17c67bb30c7713fa51842f6c35
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Dec 26 12:10:17 2024 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 26 12:10:17 2024 -0800
tree 99c4aa66810e76be89d812881b26b6306087ab1a
parent 381625d95f575c32ee5b675af77b7c6d7c9676b7
parent cde82783e51798154331055fb45dbde62f4fcd32

Merge "[Bugfix]Avoid device reboot caused by SecurityException." into main

services/core/java/com/android/server/am/ContentProviderHelper.java

diff --git a/services/core/java/com/android/server/am/ContentProviderHelper.java b/services/core/java/com/android/server/am/ContentProviderHelper.java
index da40826..f72fdf8 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 @@
                                     }
                                 }
                             }
-                        } catch (RemoteException ignored) {
+                        } catch (RemoteException|SecurityException ignored) {
                         }
                     });
                 }