From 0d044caad1328809a5f7fb5848e9d488b47911e1 Mon Sep 17 00:00:00 2001 From: xinhe Date: Wed, 20 Jan 2016 10:01:43 -0800 Subject: Constant reboots with the latest Dogfood release NYC This crashs happens when user enable untrusted network but there is no NETWORK_SCORE_SERVICE BUG=26681441 Change-Id: I1aed84086e9aca179d86675b3756d08e38fb2d4f --- .../com/android/server/wifi/WifiQualifiedNetworkSelection.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/service/java/com/android/server/wifi/WifiQualifiedNetworkSelection.java b/service/java/com/android/server/wifi/WifiQualifiedNetworkSelection.java index 60de74edb..37304b6b7 100644 --- a/service/java/com/android/server/wifi/WifiQualifiedNetworkSelection.java +++ b/service/java/com/android/server/wifi/WifiQualifiedNetworkSelection.java @@ -33,7 +33,6 @@ import com.android.internal.R; import java.io.FileDescriptor; import java.io.PrintWriter; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; @@ -124,8 +123,8 @@ class WifiQualifiedNetworkSelector { mWifiConfigStore = configureStore; mWifiStateMachine = stateMachine; mWifiInfo = wifiInfo; - - context.getSystemService(Context.NETWORK_SCORE_SERVICE); + mScoreManager = + (NetworkScoreManager) context.getSystemService(Context.NETWORK_SCORE_SERVICE); if (mScoreManager != null) { mNetworkScoreCache = new WifiNetworkScoreCache(context); mScoreManager.registerNetworkScoreCache(NetworkKey.TYPE_WIFI, mNetworkScoreCache); @@ -544,7 +543,7 @@ class WifiQualifiedNetworkSelector { } if (ephemeral) { - if (mAllowUntrustedConnections) { + if (mAllowUntrustedConnections && mNetworkScoreCache != null) { int netScore = mNetworkScoreCache.getNetworkScore(scanResult, false); //get network score if (netScore != WifiNetworkScoreCache.INVALID_NETWORK_SCORE) { -- cgit v1.2.3