Revert "Hack to work around NetworkFactory bug."

This reverts commit 22fd791a340bd4b66813eefa158131bc16122580.

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