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>
This commit is contained in:
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user