diff options
| author | 2024-11-20 15:07:02 +0000 | |
|---|---|---|
| committer | 2024-11-20 15:07:02 +0000 | |
| commit | b05c28cd4e9779c1b82045cd327fda973342953d (patch) | |
| tree | 953237338c160558685b8badb24a8f493a295cb1 | |
| parent | a4cf9fc42d035f802abc6929b7569ab620659f81 (diff) | |
| parent | a6e560ca141d542274293b02cefc9c240e8a0eff (diff) | |
Merge "Better exception handling in RemoteCallbackList" into main am: a6e560ca14
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3363367
Change-Id: I2c3cfcae87f0106f951c2fa696c350c96f20c3b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/os/RemoteCallbackList.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/os/RemoteCallbackList.java b/core/java/android/os/RemoteCallbackList.java index d5630fd46eb4..4123209eb755 100644 --- a/core/java/android/os/RemoteCallbackList.java +++ b/core/java/android/os/RemoteCallbackList.java @@ -214,7 +214,7 @@ public class RemoteCallbackList<E extends IInterface> { if (mFrozenCalleePolicy != FROZEN_CALLEE_POLICY_UNSET) { try { mBinder.removeFrozenStateChangeCallback(this); - } catch (UnsupportedOperationException e) { + } catch (UnsupportedOperationException | IllegalArgumentException e) { // The kernel does not support frozen notifications. Ignore the error and move // on. } |