From 698bbdfea7e2bc4a10145d1ade9a0da3dbddc46e Mon Sep 17 00:00:00 2001
From: Xin Guan <guanxin@google.com>
Date: Thu, 25 Jul 2024 15:06:23 +0000
Subject: Fix CTS breakage for CtsDevicePolicyTestCases.

Ensure the idle check will be performed after bootup so that
the standby bucket could be refreshed immediately for the
protected packages.

Bug: 354599086
Test: atest CtsDevicePolicyTestCases:android.devicepolicy.cts.UserControlDisabledPackagesTest#setUserControlDisabledPackages_exemptFromStandbyBuckets
Change-Id: I6fb54a3bf035e06b8d3e4b2a7ec160cd830d4adc
---
 .../service/java/com/android/server/usage/AppStandbyController.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java b/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java
index c3fe0314636e..d92351de3aa1 100644
--- a/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java
+++ b/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java
@@ -1990,7 +1990,7 @@ public class AppStandbyController
             }
         }
         if (android.app.admin.flags.Flags.disallowUserControlBgUsageFix()) {
-            if (!Flags.avoidIdleCheck()) {
+            if (!Flags.avoidIdleCheck() || mInjector.getBootPhase() >= PHASE_BOOT_COMPLETED) {
                 postCheckIdleStates(userId);
             }
         }
-- 
cgit v1.2.3-59-g8ed1b