From d4fc4c7f28da76e4ecb9d47e614cd1d1041f9044 Mon Sep 17 00:00:00 2001 From: Sudheer Shanka Date: Tue, 2 May 2017 12:31:57 -0700 Subject: [PATCH] Reduce the timeout for waiting for the network state update. Also add more info to wtf log. Bug: 27803922 Test: manual Change-Id: I746c7814a77eccc9206c36fa1fb5114a6baa3735 --- .../java/com/android/server/am/ActivityManagerService.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index d46a24bec6cb..7ce1bf8f57f3 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -572,11 +572,10 @@ 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 = 2000; // 2 sec + private static final long NETWORK_ACCESS_TIMEOUT_DEFAULT_MS = 200; // 0.2 sec /** * State indicating that there is no need for any blocking for network. @@ -4332,6 +4331,7 @@ public class ActivityManagerService extends IActivityManager.Stub validateUid.idle = false; } validateUid.curProcState = validateUid.setProcState = item.processState; + validateUid.lastDispatchedProcStateSeq = item.procStateSeq; } } } @@ -23800,11 +23800,8 @@ public class ActivityManagerService extends IActivityManager.Stub if (totalTime >= mWaitForNetworkTimeoutMs) { Slog.wtf(TAG_NETWORK, "Total time waited for network rules to get updated: " + totalTime + ". Uid: " + callingUid + " procStateSeq: " - + procStateSeq); - } else if (DEBUG_NETWORK || totalTime >= mWaitForNetworkTimeoutMs / 2) { - Slog.d(TAG_NETWORK, "Total time waited for network rules to get updated: " - + totalTime + ". Uid: " + callingUid + " procStateSeq: " - + procStateSeq); + + procStateSeq + " UidRec: " + record + + " validateUidRec: " + mValidateUids.get(callingUid)); } } catch (InterruptedException e) { Thread.currentThread().interrupt(); -- 2.11.0