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

Commit c92a0084 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: Ib8055ff5186e92df287725c731274d05d530f385
parents 1a45b94f 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);

                }

            }

        }