Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am f805ba7d: Merge "Retry failed network validation every 10 minutes." into lmp-mr1-dev

Browse Source 
* commit 'f805ba7dcc0e3cde052e2d5a84dedd478f206806':
  Retry failed network validation every 10 minutes.
This commit is contained in:
Paul Jensen
2014-12-03 18:35:57 +00:00
committed by Android Git Automerger
parent 72a6aeaca0 f805ba7dcc
commit 3107a9ad24
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/connectivity/NetworkMonitor.java
View File

@@ -215,6 +215,8 @@ public class NetworkMonitor extends StateMachine {
// Default to 5s reevaluation delay. // Default to 5s reevaluation delay.
private static final int DEFAULT_REEVALUATE_DELAY_MS = 5000; private static final int DEFAULT_REEVALUATE_DELAY_MS = 5000;
private static final int MAX_RETRIES = 10; private static final int MAX_RETRIES = 10;
// Between groups of MAX_RETRIES evaluation attempts, pause 10 mins in hopes ISP outage passes.
private static final int REEVALUATE_PAUSE_MS = 10*60*1000;
private final int mReevaluateDelayMs; private final int mReevaluateDelayMs;
private int mReevaluateToken = 0; private int mReevaluateToken = 0;
private static final int INVALID_UID = -1; private static final int INVALID_UID = -1;
@@ -345,6 +347,7 @@ public class NetworkMonitor extends StateMachine {
public void enter() { public void enter() {
mConnectivityServiceHandler.sendMessage(obtainMessage(EVENT_NETWORK_TESTED, mConnectivityServiceHandler.sendMessage(obtainMessage(EVENT_NETWORK_TESTED,
NETWORK_TEST_RESULT_INVALID, 0, mNetworkAgentInfo)); NETWORK_TEST_RESULT_INVALID, 0, mNetworkAgentInfo));
if (!mUserDoesNotWant) sendMessageDelayed(CMD_FORCE_REEVALUATION, REEVALUATE_PAUSE_MS);
} }
@Override @Override
@@ -360,6 +363,15 @@ public class NetworkMonitor extends StateMachine {
return NOT_HANDLED; return NOT_HANDLED;
} }
} }
@Override
public void exit() {
// NOTE: This removes the delayed message posted by enter() but will inadvertently
// remove any other CMD_FORCE_REEVALUATION in the message queue. At the moment this
// is harmless. If in the future this becomes problematic a different message could
// be used.
removeMessages(CMD_FORCE_REEVALUATION);
}
} }
// Being in the ValidatedState State indicates a Network is: // Being in the ValidatedState State indicates a Network is: