summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-01-21 23:26:19 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-01-21 23:26:19 +0000
commitc7f5e2f7ae4f94b0d3383746b12ec414db9a1a63 (patch)
treebe5e57ea415ec9e98eefb9161c7c8d30117a1654
parent1ae7f40466b5611b47d996f1b2441ed236c39719 (diff)
parent935f1287e83350c832cf565ea32f2400a15cd2ac (diff)
Merge "Merge "freezer: increase timeout to 5 mins" into rvc-qpr-dev am: 821bc3759c" into rvc-qpr-dev-plus-aosp am: 935f1287e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13385165 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8e1ccb378cb8293b55bd2dc32ea49934a12ac297
-rw-r--r--services/core/java/com/android/server/am/CachedAppOptimizer.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/CachedAppOptimizer.java b/services/core/java/com/android/server/am/CachedAppOptimizer.java
index 9eb7c07baaed..dd09a1c85682 100644
--- a/services/core/java/com/android/server/am/CachedAppOptimizer.java
+++ b/services/core/java/com/android/server/am/CachedAppOptimizer.java
@@ -133,7 +133,7 @@ public final class CachedAppOptimizer {
static final int REPORT_UNFREEZE_MSG = 4;
//TODO:change this static definition into a configurable flag.
- static final int FREEZE_TIMEOUT_MS = 10000;
+ static final long FREEZE_TIMEOUT_MS = 600000;
static final int DO_FREEZE = 1;
static final int REPORT_UNFREEZE = 2;