commit e78c205dc8ef24da132550df21bda93567b1cccf
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Dec 15 21:00:45 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 15 21:00:45 2022 +0000
tree af120f127fefea8aaee212960fbc134fe3060932
parent 1693f1766727e83fcadc8eaa487181d317e8ee75
parent a31610f23ae0848b03ecaa1f0bd0b5595492fa65

Merge "Don't update the standby bucket for apps that were just restored." into tm-qpr-dev

apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java

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 b1fb49c..a6f47d4 100644
--- a/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java
+++ b/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java
@@ -975,13 +975,17 @@
                                     + standbyBucketToString(newBucket));
                         }
                     } else {
-                        newBucket = getBucketForLocked(packageName, userId,
-                                elapsedRealtime);
-                        if (DEBUG) {
-                            Slog.d(TAG, "Evaluated AOSP newBucket = "
-                                    + standbyBucketToString(newBucket));
+                        // Don't update the standby state for apps that were restored
+                        if (!(oldMainReason == REASON_MAIN_DEFAULT
+                                && (app.bucketingReason & REASON_SUB_MASK)
+                                        == REASON_SUB_DEFAULT_APP_RESTORED)) {
+                            newBucket = getBucketForLocked(packageName, userId, elapsedRealtime);
+                            if (DEBUG) {
+                                Slog.d(TAG, "Evaluated AOSP newBucket = "
+                                        + standbyBucketToString(newBucket));
+                            }
+                            reason = REASON_MAIN_TIMEOUT;
                         }
-                        reason = REASON_MAIN_TIMEOUT;
                     }
                 }