commit 4274dee38b6ec6ea934305e546f02fb74cd3d6e8
author Treehugger Robot <treehugger-gerrit@google.com> Mon Feb 07 11:07:18 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Feb 07 11:07:18 2022 +0000
tree d2b94bdcf22666c7f216d638e5b36e285e56fb02
parent e8a291569966431c15488a23143f0cf9689f808d
parent 2eb67594164a6d29b8abd0628529257782aa10fa

Merge "Catch SecurityException when sending clip change broadcast."

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.
                 }