commit f2cd4371fe4985ad23473ac7885754927a578ca2
author Sudheer Shanka <sudheersai@google.com> Fri Mar 31 19:03:07 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 31 19:03:12 2017 +0000
tree 219b77e6836281be1fe24a0ec67a464918f3cf75
parent 398b37539b9e412e61bb58f31980cde096e3da32
parent 1feecdd73e75242525333741d784b42af62ee151

Merge "Update default max time of waiting for network state to get updated." into oc-dev

services/core/java/com/android/server/am/ActivityManagerService.java

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 653eed5..c64204f 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 @@
     // 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.