am 0a1bac88: Merge "Don\'t reevaluate disconnected networks" into mnc-dev

* commit '0a1bac889906c4b8ae335d5e1fb845eaa1f44efb':
  Don't reevaluate disconnected networks
This commit is contained in:
Paul Jensen
2015-06-30 11:21:23 +00:00
committed by Android Git Automerger

View File

@@ -2711,7 +2711,10 @@ public class ConnectivityService extends IConnectivityManager.Stub
} else {
nai = getNetworkAgentInfoForNetwork(network);
}
if (nai == null) return;
if (nai == null || nai.networkInfo.getState() == NetworkInfo.State.DISCONNECTING ||
nai.networkInfo.getState() == NetworkInfo.State.DISCONNECTED) {
return;
}
// Revalidate if the app report does not match our current validated state.
if (hasConnectivity == nai.lastValidated) return;
final int uid = Binder.getCallingUid();