diff options
| author | Glen Kuhne <kuh@google.com> | 2017-04-19 19:56:11 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-19 19:56:11 +0000 |
| commit | f834ea61e325b09aa08d3a7884fab67989f9bf6d (patch) | |
| tree | f5fa97c5948624fbbe9f4505533a18dd1d02718b | |
| parent | 79327970e5e0abad3e372052e17c0353a46f9dae (diff) | |
| parent | fdc5deaef5eeb9c9641ec791801fb666283d7d9b (diff) | |
Fix null exception error
am: fdc5deaef5
Change-Id: Ia3b7bf04a01af9d7f4e62cb876d5863a33c02028
| -rw-r--r-- | service/java/com/android/server/wifi/WifiStateMachine.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java index ccd1d465a..21d6be192 100644 --- a/service/java/com/android/server/wifi/WifiStateMachine.java +++ b/service/java/com/android/server/wifi/WifiStateMachine.java @@ -5800,7 +5800,9 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss // If this network was explicitly selected by the user, evaluate whether to call // explicitlySelected() so the system can treat it appropriately. WifiConfiguration config = getCurrentWifiConfiguration(); - if (mWifiConfigManager.getLastSelectedNetwork() == config.networkId) { + if (config == null) { + Log.wtf(TAG, "Current WifiConfiguration is null, but IP provisioning just succeeded"); + } else if (mWifiConfigManager.getLastSelectedNetwork() == config.networkId) { boolean prompt = mWifiPermissionsUtil.checkConfigOverridePermission(config.lastConnectUid); if (mVerboseLoggingEnabled) { |