Merge "WFD-R2: Set IP provisioning mode to IPV6 link local" into main

3 files changed, 10 insertions, 0 deletions

diff --git a/framework/java/android/net/wifi/p2p/WifiP2pConfig.java b/framework/java/android/net/wifi/p2p/WifiP2pConfig.java
index 8f8374a558..8e0805797f 100644
--- a/framework/java/android/net/wifi/p2p/WifiP2pConfig.java
+++ b/framework/java/android/net/wifi/p2p/WifiP2pConfig.java
@@ -1019,6 +1019,8 @@ public class WifiP2pConfig implements Parcelable {
             config.mJoinExistingGroup = mJoinExistingGroup;
             if (mPairingBootstrappingConfig != null) {
                 config.mPairingBootstrappingConfig = mPairingBootstrappingConfig;
+                config.mGroupClientIpProvisioningMode =
+                        GROUP_CLIENT_IP_PROVISIONING_MODE_IPV6_LINK_LOCAL;
                 config.wps.setup = WpsInfo.INVALID;
             }
             config.mIsAuthorizeConnectionFromPeerEnabled = mIsAuthorizeConnectionFromPeerEnabled;
diff --git a/framework/tests/src/android/net/wifi/p2p/WifiP2pConfigTest.java b/framework/tests/src/android/net/wifi/p2p/WifiP2pConfigTest.java
index cb7df2d6f3..afdcd66142 100644
--- a/framework/tests/src/android/net/wifi/p2p/WifiP2pConfigTest.java
+++ b/framework/tests/src/android/net/wifi/p2p/WifiP2pConfigTest.java
@@ -461,6 +461,8 @@ public class WifiP2pConfigTest {
                 c.getPairingBootstrappingConfig();
         assertNotNull(pairingBootstrappingConfig);
         assertEquals(expectedPairingBootstrappingConfig, pairingBootstrappingConfig);
+        assertEquals(c.getGroupClientIpProvisioningMode(),
+                GROUP_CLIENT_IP_PROVISIONING_MODE_IPV6_LINK_LOCAL);
     }
 
     /**
diff --git a/service/java/com/android/server/wifi/p2p/WifiP2pServiceImpl.java b/service/java/com/android/server/wifi/p2p/WifiP2pServiceImpl.java
index fcde391839..301240f3fd 100644
--- a/service/java/com/android/server/wifi/p2p/WifiP2pServiceImpl.java
+++ b/service/java/com/android/server/wifi/p2p/WifiP2pServiceImpl.java
@@ -6940,6 +6940,8 @@ public class WifiP2pServiceImpl extends IWifiP2pManager.Stub {
             mSavedPeerConfig = new WifiP2pConfig.Builder()
                     .setDeviceAddress(MacAddress.fromString(device.deviceAddress))
                     .setPairingBootstrappingConfig(pairingBootstrappingConfig)
+                    .setGroupClientIpProvisioningMode(
+                            GROUP_CLIENT_IP_PROVISIONING_MODE_IPV6_LINK_LOCAL)
                     .build();
             mPeers.updateStatus(device.deviceAddress, WifiP2pDevice.INVITED);
             sendPeersChangedBroadcast();
@@ -6979,6 +6981,8 @@ public class WifiP2pServiceImpl extends IWifiP2pManager.Stub {
                 mSavedPeerConfig = new WifiP2pConfig.Builder()
                         .setDeviceAddress(MacAddress.fromString(device.deviceAddress))
                         .setPairingBootstrappingConfig(pairingBootstrappingConfig)
+                        .setGroupClientIpProvisioningMode(
+                                GROUP_CLIENT_IP_PROVISIONING_MODE_IPV6_LINK_LOCAL)
                         .build();
                 mPeers.updateStatus(device.deviceAddress, WifiP2pDevice.INVITED);
                 sendPeersChangedBroadcast();
@@ -7023,6 +7027,8 @@ public class WifiP2pServiceImpl extends IWifiP2pManager.Stub {
                 mSavedPeerConfig = new WifiP2pConfig.Builder()
                         .setDeviceAddress(MacAddress.fromString(device.deviceAddress))
                         .setPairingBootstrappingConfig(pairingBootstrappingConfig)
+                        .setGroupClientIpProvisioningMode(
+                                GROUP_CLIENT_IP_PROVISIONING_MODE_IPV6_LINK_LOCAL)
                         .build();
                 if (provDisc.getVendorData() != null) {
                     mSavedPeerConfig.setVendorData(provDisc.getVendorData());