diff options
| author | Glen Kuhne <kuh@google.com> | 2017-04-12 21:22:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-04-12 21:22:11 +0000 |
| commit | c7bed201a7192667b20e6d166d7f55844ba9ec4e (patch) | |
| tree | 78079923ffcd36a84a6ec11374678806282e4bb4 /service | |
| parent | e4a99c6c3d3ce34ac33c7fb63fc4202468580a91 (diff) | |
| parent | c46316ffd330a903c70734dc7922410951a0f7a8 (diff) | |
Merge "Fix null exception error" into oc-dev
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 048c86007..707127fbb 100644 --- a/service/java/com/android/server/wifi/WifiStateMachine.java +++ b/service/java/com/android/server/wifi/WifiStateMachine.java @@ -5845,7 +5845,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) { |