Merge "Catch exception when stopping OTP session twice" into tm-dev (de15991a) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/permission/OneTimePermissionUserManager.java

+15 −3

Original line number	Diff line number	Diff line
		@@ -317,9 +317,21 @@ public class OneTimePermissionUserManager {
		synchronized (mInnerLock) {
		mIsFinished = true;
		cancelAlarmLocked();
		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);
		}
		}
		}