diff options
| author | Erik Kline <ek@google.com> | 2017-10-18 06:09:49 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-18 06:09:49 +0000 |
| commit | 456a25e50b2fa4c85f14b74801edf6d84b650b20 (patch) | |
| tree | f68c2d7e6b13a50bec2b6b1608990dad000859e4 | |
| parent | 19dbe8735a8ddff6553fc080bc7afa1c19f51603 (diff) | |
| parent | 0bdc11d188e193a8bda7e047ac87e33771f03dcc (diff) | |
| download | wifi-456a25e50b2fa4c85f14b74801edf6d84b650b20.tar.gz | |
Pass more information to IpManager am: b154dd137d am: 3847f15a7c
am: 0bdc11d188
Change-Id: I68f1296e0d7ce7607ae19d64fd1452cda32f2b5f
| -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 ac7d748bb..c149dfa47 100644 --- a/service/java/com/android/server/wifi/WifiStateMachine.java +++ b/service/java/com/android/server/wifi/WifiStateMachine.java @@ -6025,14 +6025,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 @@ -6072,12 +6069,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); |