diff options
author | 2017-02-22 22:07:16 +0000 | |
---|---|---|
committer | 2017-02-22 22:07:20 +0000 | |
commit | ed208456ef5cb49b19400b058213cda1dd857c32 (patch) | |
tree | 47068662402b32072c477e0eb17a3bb5d388971b | |
parent | 56eef4433fad7dff788107425b03a762855e36b4 (diff) | |
parent | 769ba4918a3eea475e83ab619810180f8224cb42 (diff) |
Merge "Revert "Set default wait-for-network timeout to 0.""
-rw-r--r-- | services/core/java/com/android/server/am/CoreSettingsObserver.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/CoreSettingsObserver.java b/services/core/java/com/android/server/am/CoreSettingsObserver.java index 62c3f4a47c03..9b459d197c89 100644 --- a/services/core/java/com/android/server/am/CoreSettingsObserver.java +++ b/services/core/java/com/android/server/am/CoreSettingsObserver.java @@ -57,7 +57,7 @@ final class CoreSettingsObserver extends ContentObserver { private final ActivityManagerService mActivityManagerService; - private static final long WAIT_FOR_NETWORK_TIMEOUT_DEFAULT_MS = 0; // 0 sec + private static final long WAIT_FOR_NETWORK_TIMEOUT_DEFAULT_MS = 2000; // 2 sec public CoreSettingsObserver(ActivityManagerService activityManagerService) { super(activityManagerService.mHandler); |