Stop logging false error when lingering completes.

When lingering completes ConnectivityService would log an error message
saying the Network still had NetworkRequests.  Fixed by ignoring
listening NetworkRequests which aren't a problem.

Change-Id: Ie78a1f91c47b012eae28a377dd77bee2cfcbde3b
This commit is contained in:
Paul Jensen
2014-09-05 10:18:36 -04:00
parent c92d3ebde4
commit f2d8b983b5

View File

@@ -4436,10 +4436,14 @@ public class ConnectivityService extends IConnectivityManager.Stub {
loge("Unknown NetworkAgentInfo in handleLingerComplete"); loge("Unknown NetworkAgentInfo in handleLingerComplete");
return; return;
} }
if (DBG) log("handleLingerComplete for " + oldNetwork.name());
if (DBG) { if (DBG) {
if (oldNetwork.networkRequests.size() != 0) { log("handleLingerComplete for " + oldNetwork.name());
loge("Dead network still had " + oldNetwork.networkRequests.size() + " requests"); for (int i = 0; i < oldNetwork.networkRequests.size(); i++) {
NetworkRequest nr = oldNetwork.networkRequests.valueAt(i);
// Ignore listening requests.
if (mNetworkRequests.get(nr).isRequest == false) continue;
loge("Dead network still had at least " + nr);
break;
} }
} }
oldNetwork.asyncChannel.disconnect(); oldNetwork.asyncChannel.disconnect();