diff options
| author | Glen Kuhne <kuh@google.com> | 2017-04-03 09:24:33 -0700 |
|---|---|---|
| committer | Glen Kuhne <kuh@google.com> | 2017-04-18 09:36:14 -0700 |
| commit | fdc5deaef5eeb9c9641ec791801fb666283d7d9b (patch) | |
| tree | f5fa97c5948624fbbe9f4505533a18dd1d02718b /service | |
| parent | 8ab4881b5771ddd8ab3fa475362ac42efccff9c4 (diff) | |
Fix null exception error
Added a missing null check that was causing rare framework reset bug.
Bug: 36625896
Test: Existing Unit tests
Change-Id: I3aac9b8e629bbe288d191aef783651837f36095e
Merged In: I3aac9b8e629bbe288d191aef783651837f36095e
Diffstat (limited to 'service')
| -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) { |