Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ee4ad86 authored by Thomas Vannet's avatar Thomas Vannet Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17291091

Change-Id: I12606d8fac9d61ef9bb3ef9150d9b9eea3e91d36
parents 1b527673 de15991a

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

                }

            }

        }