From fb818c519df183efecb023a14fc2654da04fad32 Mon Sep 17 00:00:00 2001 From: Thomas Vannet Date: Mon, 21 Mar 2022 07:57:30 -0700 Subject: [PATCH] Catch exception when stopping OTP session twice An uncaught IllegalArgumentException thrown in ActivityManager.removeOnUidImportanceListener would result in a one-time permission session for a background group sometimes not getting cleaned up properly, leading to background permissions not geting revoked. Test: run cts -m CtsPermissionTestCases -t android.permission.cts.RevokeSelfPermissionTest Bug: 225386829 Change-Id: Iad7f181866b407d556672457ade1f3312d10a95d --- .../OneTimePermissionUserManager.java | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/pm/permission/OneTimePermissionUserManager.java b/services/core/java/com/android/server/pm/permission/OneTimePermissionUserManager.java index 60602337ba1aa..881f8707fdd86 100644 --- a/services/core/java/com/android/server/pm/permission/OneTimePermissionUserManager.java +++ b/services/core/java/com/android/server/pm/permission/OneTimePermissionUserManager.java @@ -317,9 +317,21 @@ public class OneTimePermissionUserManager { synchronized (mInnerLock) { mIsFinished = true; cancelAlarmLocked(); - mActivityManager.removeOnUidImportanceListener(mStartTimerListener); - mActivityManager.removeOnUidImportanceListener(mSessionKillableListener); - mActivityManager.removeOnUidImportanceListener(mGoneListener); + try { + mActivityManager.removeOnUidImportanceListener(mStartTimerListener); + } catch (IllegalArgumentException e) { + Log.e(LOG_TAG, "Could not remove start timer listener", e); + } + try { + mActivityManager.removeOnUidImportanceListener(mSessionKillableListener); + } catch (IllegalArgumentException e) { + Log.e(LOG_TAG, "Could not remove session killable listener", e); + } + try { + mActivityManager.removeOnUidImportanceListener(mGoneListener); + } catch (IllegalArgumentException e) { + Log.e(LOG_TAG, "Could not remove gone listener", e); + } } }