diff options
| -rw-r--r-- | services/core/java/com/android/server/pm/permission/OneTimePermissionUserManager.java | 18 |
1 files 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 60602337ba1a..881f8707fdd8 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); + } } } |