commit 22fd791a340bd4b66813eefa158131bc16122580
author Jeff Davidson <jpd@google.com> Tue Dec 16 15:49:33 2014 -0800
committer Jeff Davidson <jpd@google.com> Wed Dec 17 21:59:20 2014 +0000
tree 1e6b1c6461fc18f47d72958582785286474b659c
parent 3e9919c26d559b36a559c2032bedad202a502bd5

Hack to work around NetworkFactory bug.

Should be reverted before launch, when a proper fix is in.

Bug: 18637384
Change-Id: Id883cbc3c9379a7bad6237e9738a7b09fc5d3503

service/java/com/android/server/wifi/WifiStateMachine.java

diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java
index 6944461..1a16c0f 100644
--- a/service/java/com/android/server/wifi/WifiStateMachine.java
+++ b/service/java/com/android/server/wifi/WifiStateMachine.java
@@ -4604,7 +4604,9 @@
 
         @Override
         protected void needNetworkFor(NetworkRequest networkRequest, int score) {
-            ++mConnectionRequests;
+            if (score < 60) {
+                ++mConnectionRequests;
+            }
             if (!networkRequest.networkCapabilities.hasCapability(
                     NetworkCapabilities.NET_CAPABILITY_TRUSTED)) {
                 if (++mUntrustedReqCount == 1) {
@@ -4637,7 +4639,7 @@
             if (mCm != null) {
                 mNetworkFactory = new WifiNetworkFactory(getHandler().getLooper(), mContext,
                         NETWORKTYPE, mNetworkCapabilitiesFilter);
-                mNetworkFactory.setScoreFilter(60);
+                mNetworkFactory.setScoreFilter(Integer.MAX_VALUE);
                 mNetworkFactory.register();
             }
         }