From 69f86a6475a0375801806538a727dcf9e1d44812 Mon Sep 17 00:00:00 2001 From: Varun Shah Date: Tue, 13 Dec 2022 09:17:26 -0800 Subject: [PATCH] Fix incorrect message being sent for all intents. Only send the CHECK_PACKAGE_IDLE_STATE message for ACTION_PACKAGE_CHANGED and not for ACTION_PACKAGE_ADDED. Bug: 214580000 Test: atest UsageStatsDatabaseTest Test: manually verify buckets are restored Change-Id: Iac1433b9b7e3904eb7f753cd0617ac64ab6f7944 --- .../java/com/android/server/usage/AppStandbyController.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 1a775b4e1d49a..68699368dfb30 100644 --- a/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java +++ b/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java @@ -2187,8 +2187,10 @@ public class AppStandbyController } // component-level enable/disable can affect bucketing, so we always // reevaluate that for any PACKAGE_CHANGED - mHandler.obtainMessage(MSG_CHECK_PACKAGE_IDLE_STATE, userId, -1, pkgName) - .sendToTarget(); + if (Intent.ACTION_PACKAGE_CHANGED.equals(action)) { + mHandler.obtainMessage(MSG_CHECK_PACKAGE_IDLE_STATE, userId, -1, pkgName) + .sendToTarget(); + } } if ((Intent.ACTION_PACKAGE_REMOVED.equals(action) || Intent.ACTION_PACKAGE_ADDED.equals(action))) {