diff options
| author | Glen Kuhne <kuh@google.com> | 2017-04-12 22:53:40 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-12 22:53:40 +0000 |
| commit | f3d15360a4daa786d795868c96a53527eb56b8c6 (patch) | |
| tree | 174cdc1c91dcc0bbf8a6aa163dae50766e343842 /service | |
| parent | 997a8743cd5be5812ec176fe15c5fa0fa0d55495 (diff) | |
| parent | e99729e3b188241937830c0ef9e021caa52629a7 (diff) | |
Merge "Fix null exception error" into oc-dev am: c7bed201a7
am: e99729e3b1
Change-Id: Idd2b1eda1247b9ea4b27b44046d99bbf45c38cee
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) { |