diff options
| author | 2017-03-31 19:12:38 +0000 | |
|---|---|---|
| committer | 2017-03-31 19:12:38 +0000 | |
| commit | ced4c86bc7debcc1f4d27f0c9f172a584d967fd6 (patch) | |
| tree | bb1c0fba0e71cff31d1f93ffaea30c6ccb2ab8b0 | |
| parent | 55359c13d79dc094b108b87ef09282ec97f09dea (diff) | |
| parent | 2fd55e29ced131df59687118f0c1803ddde387d5 (diff) | |
Merge "Update default max time of waiting for network state to get updated." into oc-dev am: f2cd4371fe
am: 2fd55e29ce
Change-Id: I1556eace21bd73be9f057f699527afa25a2b8856
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityManagerService.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 653eed5ae56f..c64204f57448 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -574,10 +574,11 @@ public class ActivityManagerService extends IActivityManager.Stub // Determines whether to take full screen screenshots static final boolean TAKE_FULLSCREEN_SCREENSHOTS = true; + // STOPSHIP: Update default to a smaller value. /** * Default value for {@link Settings.Global#NETWORK_ACCESS_TIMEOUT_MS}. */ - private static final long NETWORK_ACCESS_TIMEOUT_DEFAULT_MS = 0; // 0 sec + private static final long NETWORK_ACCESS_TIMEOUT_DEFAULT_MS = 2000; // 2 sec /** * State indicating that there is no need for any blocking for network. |