diff options
| -rw-r--r-- | core/java/android/app/usage/flags.aconfig | 11 | ||||
| -rw-r--r-- | services/usage/java/com/android/server/usage/UsageStatsService.java | 7 |
2 files changed, 17 insertions, 1 deletions
diff --git a/core/java/android/app/usage/flags.aconfig b/core/java/android/app/usage/flags.aconfig index c7b168aaf81d..04c36867271c 100644 --- a/core/java/android/app/usage/flags.aconfig +++ b/core/java/android/app/usage/flags.aconfig @@ -47,3 +47,14 @@ flag { description: "Feature flag for collecting app data size by file type API" bug: "294088945" } + +flag { + name: "disable_idle_check" + namespace: "backstage_power" + description: "disable idle check for USER_SYSTEM during boot up" + is_fixed_read_only: true + bug: "337864590" + metadata { + purpose: PURPOSE_BUGFIX + } +} diff --git a/services/usage/java/com/android/server/usage/UsageStatsService.java b/services/usage/java/com/android/server/usage/UsageStatsService.java index 9d14290bdd8a..2e93cba80386 100644 --- a/services/usage/java/com/android/server/usage/UsageStatsService.java +++ b/services/usage/java/com/android/server/usage/UsageStatsService.java @@ -654,7 +654,10 @@ public class UsageStatsService extends SystemService implements } } else if (Intent.ACTION_USER_STARTED.equals(action)) { if (userId >= 0) { - mHandler.obtainMessage(MSG_USER_STARTED, userId, 0).sendToTarget(); + if (!Flags.disableIdleCheck() || userId > 0) { + // Don't check idle state for USER_SYSTEM during the boot up. + mHandler.obtainMessage(MSG_USER_STARTED, userId, 0).sendToTarget(); + } } } } @@ -2013,6 +2016,8 @@ public class UsageStatsService extends SystemService implements + ": " + Flags.useParceledList()); pw.println(" " + Flags.FLAG_FILTER_BASED_EVENT_QUERY_API + ": " + Flags.filterBasedEventQueryApi()); + pw.println(" " + Flags.FLAG_DISABLE_IDLE_CHECK + + ": " + Flags.disableIdleCheck()); final int[] userIds; synchronized (mLock) { |