commit b154dd137d481508bfe44cceb3cd51c448b73e57
author Erik Kline <ek@google.com> Wed Oct 04 23:20:50 2017 +0900
committer Erik Kline <ek@google.com> Wed Oct 11 19:48:26 2017 +0900
tree f912a489156c3d6d1d9d3ea6dcbdcc664c345870
parent c707c6d7fb3aafc033add2c1418211e7227be076

Pass more information to IpManager

Pass in a display name, to assist with logging, as well as the
L2ConnectedState-created NetworkAgent's network id.

Test: as follows
    - built
    - flashed
    - booted
Bug: 62476366

Change-Id: Ib37a63dc1864cd4c23bf0cad55b6944e857fd2c6

service/java/com/android/server/wifi/WifiStateMachine.java

diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java
index 19c4812..671ede5 100644
--- a/service/java/com/android/server/wifi/WifiStateMachine.java
+++ b/service/java/com/android/server/wifi/WifiStateMachine.java
@@ -5805,14 +5805,11 @@
     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
@@ -5852,12 +5849,16 @@
                 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);