From f130a204f6245eea750551766b79a32b6182914a Mon Sep 17 00:00:00 2001
From: Jing Ji <jji@google.com>
Date: Sun, 20 Mar 2022 00:29:33 -0700
Subject: [PATCH] Check the config before moving to restricted bucket on bg
 restriction

Bug: 221886417
Test: atest FrameworksMockingServicesTests:BackgroundRestrictionTest
Change-Id: I20602e9d6b4745d08857c30dcdcb4a7224a3a0e2
---
 .../com/android/server/am/AppRestrictionController.java     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/services/core/java/com/android/server/am/AppRestrictionController.java b/services/core/java/com/android/server/am/AppRestrictionController.java
index 15484b2d618eb..41ff08309d89e 100644
--- 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);