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

Commit b33696ae authored by Jing Ji's avatar Jing Ji Committed by Automerger Merge Worker
Browse files

Merge "Check the config before moving to restricted bucket on bg restriction"... 

Merge "Check the config before moving to restricted bucket on bg restriction" into tm-dev am: d4937bbc

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

Change-Id: I7edd0e9518f8d91672533cca1de8391313f29127
parents f3412519 d4937bbc

services/core/java/com/android/server/am/AppRestrictionController.java

+6 −0
Original line number Diff line number Diff line
@@ -1841,6 +1841,9 @@ public final class AppRestrictionController { 
    }



    void handleUidInactive(int uid, boolean disabled) {

        if (!mConstantsObserver.mBgAutoRestrictedBucket) {

            return;

        }

        final ArrayList<Runnable> pendingTasks = mTmpRunnables;

        synchronized (mSettingsLock) {

            final int index = mActiveUids.indexOfKey(uid);
@@ -1863,6 +1866,9 @@ public final class AppRestrictionController { 
    }



    void handleUidActive(int uid) {

        if (!mConstantsObserver.mBgAutoRestrictedBucket) {

            return;

        }

        synchronized (mSettingsLock) {

            final AppStandbyInternal appStandbyInternal = mInjector.getAppStandbyInternal();

            final int userId = UserHandle.getUserId(uid);