commit 99f50fd1047283ae21deab0e1e63eb849211b35d
author Treehugger Robot <treehugger-gerrit@google.com> Mon Feb 07 11:24:53 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Feb 07 11:24:53 2022 +0000
tree d2b94bdcf22666c7f216d638e5b36e285e56fb02
parent e023531772440bcb40004e3eeeec62ce1617cda9
parent 4274dee38b6ec6ea934305e546f02fb74cd3d6e8

Merge "Catch SecurityException when sending clip change broadcast." am: 4274dee38b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1972641

Change-Id: I31e7357ec4babe64136cf586fa4f47cb277e7d63

services/core/java/com/android/server/clipboard/ClipboardService.java

diff --git a/services/core/java/com/android/server/clipboard/ClipboardService.java b/services/core/java/com/android/server/clipboard/ClipboardService.java
index 38df5f8..a0c5aa3 100644
--- a/services/core/java/com/android/server/clipboard/ClipboardService.java
+++ b/services/core/java/com/android/server/clipboard/ClipboardService.java
@@ -639,7 +639,7 @@
                         clipboard.primaryClipListeners.getBroadcastItem(i)
                                 .dispatchPrimaryClipChanged();
                     }
-                } catch (RemoteException e) {
+                } catch (RemoteException | SecurityException e) {
                     // The RemoteCallbackList will take care of removing
                     // the dead object for us.
                 }