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

am 2e54f13b: Merge "Report invalid network after one failed attempt." into mnc-dev

Browse Source 
* commit '2e54f13b468a3abfc404ad5b7eed6bf2c73f55de':
  Report invalid network after one failed attempt.
This commit is contained in:
Paul Jensen
2015-05-20 13:09:20 +00:00
committed by Android Git Automerger
parent 886ab25644 2e54f13b46
commit db4010b3fe
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -190,10 +190,8 @@ public class NetworkMonitor extends StateMachine {
private int mReevaluateToken = 0;
private static final int INVALID_UID = -1;
private int mUidResponsibleForReeval = INVALID_UID;
// When network has been evaluated this many times:
// 1. report NETWORK_TEST_RESULT_INVALID
// 2. stop blaming UID that requested re-evaluation for further attempts
private static final int INITIAL_EVALUATION_ATTEMPTS = 3;
// Stop blaming UID that requested re-evaluation after this many attempts.
private static final int BLAME_FOR_EVALUATION_ATTEMPTS = 5;
private final Context mContext;
private final Handler mConnectivityServiceHandler;
@@ -438,12 +436,12 @@ public class NetworkMonitor extends StateMachine {
} else if (httpResponseCode >= 200 && httpResponseCode <= 399) {
transitionTo(mCaptivePortalState);
} else {
Message msg = obtainMessage(CMD_REEVALUATE, ++mReevaluateToken, 0);
final Message msg = obtainMessage(CMD_REEVALUATE, ++mReevaluateToken, 0);
sendMessageDelayed(msg, mReevaluateDelayMs);
if (mAttempts >= INITIAL_EVALUATION_ATTEMPTS) {
mConnectivityServiceHandler.sendMessage(obtainMessage(
EVENT_NETWORK_TESTED, NETWORK_TEST_RESULT_INVALID, 0,
mNetworkAgentInfo));
mConnectivityServiceHandler.sendMessage(obtainMessage(
EVENT_NETWORK_TESTED, NETWORK_TEST_RESULT_INVALID, 0,
mNetworkAgentInfo));
if (mAttempts >= BLAME_FOR_EVALUATION_ATTEMPTS) {
// Don't continue to blame UID forever.
TrafficStats.clearThreadStatsUid();
}