Merge "ART: Decrease dex2oat watchdog timeout"
diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc
index 6cc9903..cc32da1 100644
--- a/dex2oat/dex2oat.cc
+++ b/dex2oat/dex2oat.cc
@@ -435,8 +435,10 @@
// Debug builds are slower so they have larger timeouts.
static constexpr int64_t kSlowdownFactor = kIsDebugBuild ? 5U : 1U;
- // 10 minutes scaled by kSlowdownFactor.
- static constexpr int64_t kWatchDogTimeoutSeconds = kSlowdownFactor * 10 * 60;
+ // 9.5 minutes scaled by kSlowdownFactor. This is slightly smaller than the Package Manager
+ // watchdog (PackageManagerService.WATCHDOG_TIMEOUT, 10 minutes), so that dex2oat will abort
+ // itself before that watchdog would take down the system server.
+ static constexpr int64_t kWatchDogTimeoutSeconds = kSlowdownFactor * (9 * 60 + 30);
bool is_watch_dog_enabled_;
bool shutting_down_;