diff options
| author | Erik Kline <ek@google.com> | 2017-10-18 06:07:21 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-18 06:07:21 +0000 |
| commit | 0bdc11d188e193a8bda7e047ac87e33771f03dcc (patch) | |
| tree | b3bc3b5dd9503de6a7238537fcd67184d5ee518a | |
| parent | 0765d6e87c2623ce88f8fc241b9cd0a8e9f2ae35 (diff) | |
| parent | 3847f15a7ca90260e0017aec743106f36bfaaef4 (diff) | |
| download | wifi-0bdc11d188e193a8bda7e047ac87e33771f03dcc.tar.gz | |
Pass more information to IpManager am: b154dd137d
am: 3847f15a7c
Change-Id: I0f36f03ba255605883417036c44c982bb188a048
| -rw-r--r-- | service/java/com/android/server/wifi/WifiStateMachine.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java index bf5d08b09..568635d12 100644 --- a/service/java/com/android/server/wifi/WifiStateMachine.java +++ b/service/java/com/android/server/wifi/WifiStateMachine.java @@ -6003,14 +6003,11 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss class ObtainingIpState extends State { @Override public void enter() { - WifiConfiguration currentConfig = getCurrentWifiConfiguration(); - boolean isUsingStaticIp = + final WifiConfiguration currentConfig = getCurrentWifiConfiguration(); + final boolean isUsingStaticIp = (currentConfig.getIpAssignment() == IpConfiguration.IpAssignment.STATIC); if (mVerboseLoggingEnabled) { - String key = ""; - if (getCurrentWifiConfiguration() != null) { - key = getCurrentWifiConfiguration().configKey(); - } + final String key = currentConfig.configKey(); log("enter ObtainingIpState netId=" + Integer.toString(mLastNetworkId) + " " + key + " " + " roam=" + mIsAutoRoaming @@ -6050,12 +6047,16 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss prov = IpManager.buildProvisioningConfiguration() .withPreDhcpAction() .withApfCapabilities(mWifiNative.getApfCapabilities()) + .withNetwork(getCurrentNetwork()) + .withDisplayName(currentConfig.SSID) .build(); } else { StaticIpConfiguration staticIpConfig = currentConfig.getStaticIpConfiguration(); prov = IpManager.buildProvisioningConfiguration() .withStaticConfiguration(staticIpConfig) .withApfCapabilities(mWifiNative.getApfCapabilities()) + .withNetwork(getCurrentNetwork()) + .withDisplayName(currentConfig.SSID) .build(); } mIpManager.startProvisioning(prov); |