diff options
| author | 2024-12-30 12:25:14 -0800 | |
|---|---|---|
| committer | 2024-12-30 12:25:14 -0800 | |
| commit | ea202fe2d28c845965ac170022b45cf540f8826c (patch) | |
| tree | 5215bc76461927c34e255bb66b9dca1836ff9da2 | |
| parent | 312e885d0d382b3b26bd3c75b2c2f714c7ed9423 (diff) | |
| parent | fa555189a5d62ea03b4934ff2a9466aa228108e9 (diff) | |
Merge "[Bugfix]Avoid device reboot caused by SecurityException." into main am: b4838c7cea am: fa555189a5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2931313
Change-Id: Ieee39aece1a6b0ad46161124e8500e5343673e51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/am/ContentProviderHelper.java | 2 |
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 6e09a84e0f8c..e4e53f4124f3 100644 --- a/services/core/java/com/android/server/am/ContentProviderHelper.java +++ b/services/core/java/com/android/server/am/ContentProviderHelper.java @@ -1434,7 +1434,7 @@ public class ContentProviderHelper { } } } - } catch (RemoteException ignored) { + } catch (RemoteException|SecurityException ignored) { } }); } |