Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Catch exception when stopping OTP session twice" into tm-dev

Browse Source
This commit is contained in:
Thomas Vannet
2022-03-22 13:52:08 +00:00
committed by Android (Google) Code Review
parent 7fb9397972 fb818c519d
commit de15991aec
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
services/core/java/com/android/server/pm/permission/OneTimePermissionUserManager.java
View File

@@ -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);
}
}
}