From bc2c44fb4e176410942fb5a4f1da053659a57f09 Mon Sep 17 00:00:00 2001 From: Yu-Ting Tseng Date: Tue, 19 Nov 2024 10:58:16 -0800 Subject: Better exception handling in RemoteCallbackList Update maybeUnsubscribeFromFrozenCallback to swallow the IAE caused by kernel not supporting frozen notifications. Change-Id: I7bd081cb733c49fd4b206d8c28f37f3f964a324d Test: atest android.app.appops2.cts.AppOpsLoggingTest Bug: 379658186 --- core/java/android/os/RemoteCallbackList.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 { 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. } -- cgit v1.2.3-59-g8ed1b