diff --git a/frameworks/base/core/java/android/net/NetworkFactory.java b/frameworks/base/core/java/android/net/NetworkFactory.java index e2f8d1a3f0..f983ebc37e 100644 --- a/frameworks/base/core/java/android/net/NetworkFactory.java +++ b/frameworks/base/core/java/android/net/NetworkFactory.java @@ -239,8 +239,8 @@ public class NetworkFactory extends Handler { (n.score > mScore || n.request.networkCapabilities.satisfiedByNetworkCapabilities( mCapabilityFilter) == false || acceptRequest(n.request, n.score) == false)) { if (VDBG) log(" releaseNetworkFor"); - releaseNetworkFor(n.request); - n.requested = false; + //releaseNetworkFor(n.request); + //n.requested = false; } else { if (VDBG) log(" done"); } diff --git a/frameworks/opt/net/ethernet/java/com/android/server/ethernet/EthernetNetworkFactory.java b/frameworks/opt/net/ethernet/java/com/android/server/ethernet/EthernetNetworkFactory.java index 89ddfb2eda..e857aeb791 100755 --- a/frameworks/opt/net/ethernet/java/com/android/server/ethernet/EthernetNetworkFactory.java +++ b/frameworks/opt/net/ethernet/java/com/android/server/ethernet/EthernetNetworkFactory.java @@ -94,7 +94,7 @@ import java.util.concurrent.CountDownLatch; class EthernetNetworkFactory { private static final String NETWORK_TYPE = "Ethernet"; private static final String TAG = "EthernetNetworkFactory"; - private static final int NETWORK_SCORE = 70; + private static final int NETWORK_SCORE = 30; private static final boolean DBG = true; private static final boolean VDBG = false; diff --git a/kernel/scripts/kconfig/conf b/kernel/scripts/kconfig/conf index d6671ab6dd..7d3d8ba7ef 100755 Binary files a/kernel/scripts/kconfig/conf and b/kernel/scripts/kconfig/conf differ