commit 6bf4508828b5191bdbed7a99ba76831a3c6ce879
author Etan Cohen <etancohen@google.com> Mon Aug 08 21:29:01 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Aug 08 21:29:01 2016 +0000
tree d128636b5c4e545fa6e1c8687ec94140b1257f42
parent f737aee5bc7cd35196fedd3887189308c83281c0
parent 4ab83906ab146d871434e2ae95c17d4b7f28606a

[NAN] Update link properties after creating agent.
am: 4ab83906ab

Change-Id: Ib1eb5f356025714bae1cc137aeb7317ffeca54c0

service/java/com/android/server/wifi/nan/WifiNanDataPathStateManager.java

diff --git a/service/java/com/android/server/wifi/nan/WifiNanDataPathStateManager.java b/service/java/com/android/server/wifi/nan/WifiNanDataPathStateManager.java
index 20535f6..f6d80b1 100644
--- a/service/java/com/android/server/wifi/nan/WifiNanDataPathStateManager.java
+++ b/service/java/com/android/server/wifi/nan/WifiNanDataPathStateManager.java
@@ -432,8 +432,12 @@
             }
 
             nnri.networkAgent = new WifiNanNetworkAgent(mLooper, mContext,
-                    AGENT_TAG_PREFIX + nnri.ndpId, networkInfo, networkCapabilities, linkProperties,
-                    NETWORK_FACTORY_SCORE_AVAIL, networkSpecifier, ndpId);
+                    AGENT_TAG_PREFIX + nnri.ndpId,
+                    new NetworkInfo(ConnectivityManager.TYPE_WIFI_P2P, 0, NETWORK_TAG, ""),
+                    networkCapabilities, new LinkProperties(), NETWORK_FACTORY_SCORE_AVAIL,
+                    networkSpecifier, ndpId);
+            nnri.networkAgent.sendNetworkInfo(networkInfo);
+            nnri.networkAgent.sendLinkProperties(linkProperties);
         } else {
             if (DBG) {
                 Log.d(TAG, "onDataPathConfirm: data-path for networkSpecifier=" + networkSpecifier