Merge "Don't send listening NetworkRequests to NetworkFactories." into lmp-dev

2014-09-09 10:59:18 +00:00
parent 3d08d3c061 c92d3ebde4
commit a7b03c56aa
1 changed files with 2 additions and 0 deletions
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -4762,6 +4762,8 @@ public class ConnectivityService extends IConnectivityManager.Stub {
        // code will fire.
        for (int i = 0; i < nai.networkRequests.size(); i++) {
            NetworkRequest nr = nai.networkRequests.valueAt(i);
+            // Don't send listening requests to factories. b/17393458
+            if (mNetworkRequests.get(nr).isRequest == false) continue;
            sendUpdatedScoreToFactories(nr, score);
        }
    }