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

2022-03-21 16:23:06 +00:00
parent 5593d1dd5d f130a204f6
commit d4937bbcb2
1 changed files with 6 additions and 0 deletions
--- a/services/core/java/com/android/server/am/AppRestrictionController.java
+++ b/services/core/java/com/android/server/am/AppRestrictionController.java
@@ -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);