LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge \"Merge \\"Add an isListen method to NetworkRequests.\\" into nyc-mr1-dev am: b5239329b1\" into nyc-mr1-dev-plus-aosp

Browse Source 
am: 17450e41b3

Change-Id: Ic71a5722ee877de73e7ffd340a5ffb84a2d4910d
This commit is contained in:
Lorenzo Colitti
2016-07-18 15:15:33 +00:00
committed by android-build-merger
parent 693b398a32 d160a5b13a
commit 2f1d7cabed
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/net/NetworkRequest.java
View File

@@ -283,6 +283,15 @@ public class NetworkRequest implements Parcelable {
} }
}; };
/**
* Returns true iff. the contained NetworkRequest is of type LISTEN.
*
* @hide
*/
public boolean isListen() {
return type == Type.LISTEN;
}
/** /**
* Returns true iff. the contained NetworkRequest is one that: * Returns true iff. the contained NetworkRequest is one that:
* *

10
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -2286,7 +2286,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
if (VDBG) log("NetworkFactory connected"); if (VDBG) log("NetworkFactory connected");
// A network factory has connected. Send it all current NetworkRequests. // A network factory has connected. Send it all current NetworkRequests.
for (NetworkRequestInfo nri : mNetworkRequests.values()) { for (NetworkRequestInfo nri : mNetworkRequests.values()) {
if (!nri.request.isRequest()) continue; if (nri.request.isListen()) continue;
NetworkAgentInfo nai = mNetworkForRequestId.get(nri.request.requestId); NetworkAgentInfo nai = mNetworkForRequestId.get(nri.request.requestId);
ac.sendMessage(android.net.NetworkFactory.CMD_REQUEST_NETWORK, ac.sendMessage(android.net.NetworkFactory.CMD_REQUEST_NETWORK,
(nai != null ? nai.getCurrentScore() : 0), 0, nri.request); (nai != null ? nai.getCurrentScore() : 0), 0, nri.request);
@@ -2428,7 +2428,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
private void handleRegisterNetworkRequest(NetworkRequestInfo nri) { private void handleRegisterNetworkRequest(NetworkRequestInfo nri) {
mNetworkRequests.put(nri.request, nri); mNetworkRequests.put(nri.request, nri);
mNetworkRequestInfoLogs.log("REGISTER " + nri); mNetworkRequestInfoLogs.log("REGISTER " + nri);
if (!nri.request.isRequest()) { if (nri.request.isListen()) {
for (NetworkAgentInfo network : mNetworkAgentInfos.values()) { for (NetworkAgentInfo network : mNetworkAgentInfos.values()) {
if (nri.request.networkCapabilities.hasSignalStrength() && if (nri.request.networkCapabilities.hasSignalStrength() &&
network.satisfiesImmutableCapabilitiesOf(nri.request)) { network.satisfiesImmutableCapabilitiesOf(nri.request)) {
@@ -4576,7 +4576,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
for (int i = 0; i < nai.numNetworkRequests(); i++) { for (int i = 0; i < nai.numNetworkRequests(); i++) {
NetworkRequest nr = nai.requestAt(i); NetworkRequest nr = nai.requestAt(i);
// Don't send listening requests to factories. b/17393458 // Don't send listening requests to factories. b/17393458
if (!nr.isRequest()) continue; if (nr.isListen()) continue;
sendUpdatedScoreToFactories(nr, nai.getCurrentScore()); sendUpdatedScoreToFactories(nr, nai.getCurrentScore());
} }
} }
@@ -4670,7 +4670,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
for (int i = 0; i < nai.numNetworkRequests(); i++) { for (int i = 0; i < nai.numNetworkRequests(); i++) {
NetworkRequest nr = nai.requestAt(i); NetworkRequest nr = nai.requestAt(i);
// Ignore listening requests. // Ignore listening requests.
if (!nr.isRequest()) continue; if (nr.isListen()) continue;
loge("Dead network still had at least " + nr); loge("Dead network still had at least " + nr);
break; break;
} }
@@ -4762,7 +4762,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
// check if it satisfies the NetworkCapabilities // check if it satisfies the NetworkCapabilities
if (VDBG) log(" checking if request is satisfied: " + nri.request); if (VDBG) log(" checking if request is satisfied: " + nri.request);
if (satisfies) { if (satisfies) {
if (!nri.request.isRequest()) { if (nri.request.isListen()) {
// This is not a request, it's a callback listener. // This is not a request, it's a callback listener.
// Add it to newNetwork regardless of score. // Add it to newNetwork regardless of score.
if (newNetwork.addRequest(nri.request)) addedRequests.add(nri); if (newNetwork.addRequest(nri.request)) addedRequests.add(nri);