diff options
| author | Roshan Pius <rpius@google.com> | 2020-05-29 00:12:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-29 00:12:43 +0000 |
| commit | b42cc467ad6d367eacd4786efbf4a96d321e21ca (patch) | |
| tree | 0de2d320870bf7b1b083019d34e01cd5c25e3317 /service | |
| parent | 7cdd88a0bdcdc48e902b32d4c3a6b24df9c41f36 (diff) | |
| parent | 0d744174965ea2a9bfe4e2f3cbff9357eeb5f1a6 (diff) | |
Merge "Add null check for getCurrentWifiConfiguration" into rvc-dev am: c1ef8e0266 am: 0d74417496
Change-Id: I4bbf18554eb3beeaa897d8b84e704a78ebbe91f8
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/ClientModeImpl.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/service/java/com/android/server/wifi/ClientModeImpl.java b/service/java/com/android/server/wifi/ClientModeImpl.java index e36d379c4..0f84b3dd9 100644 --- a/service/java/com/android/server/wifi/ClientModeImpl.java +++ b/service/java/com/android/server/wifi/ClientModeImpl.java @@ -4146,7 +4146,13 @@ public class ClientModeImpl extends StateMachine { // We switched from DHCP to static or from static to DHCP, or the // static IP address has changed. log("Reconfiguring IP on connection"); - transitionTo(mObtainingIpState); + WifiConfiguration currentConfig = getCurrentWifiConfiguration(); + if (currentConfig != null) { + transitionTo(mObtainingIpState); + } else { + Log.w(TAG, "CMD_SAVE_NETWORK Ip change - but no current " + + "Wi-Fi config"); + } } } } else if (mWifiInfo.getNetworkId() == WifiConfiguration.INVALID_NETWORK_ID |