diff options
| author | 2022-12-15 21:27:00 +0000 | |
|---|---|---|
| committer | 2022-12-15 21:27:00 +0000 | |
| commit | 3ae991218c26678bd75bbbced2f33e5ed01ba25c (patch) | |
| tree | 5341fda474e94ca894f2630c9e8eb99a76ba5a3f | |
| parent | ef6ab0627590f6e3f3633c8dfbdd5358b6aa1ceb (diff) | |
| parent | e78c205dc8ef24da132550df21bda93567b1cccf (diff) | |
Merge "Don't update the standby bucket for apps that were just restored." into tm-qpr-dev am: e78c205dc8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20747643
Change-Id: I0f67f61cfd1d55be522a496b7b6f3cf354826ca5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java | 16 |
1 files changed, 10 insertions, 6 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 b1fb49c7f5f3..a6f47d4e4908 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 @@ public class AppStandbyController + 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; } } |