diff options
| author | Jimmy Chen <jimmycmchen@google.com> | 2019-07-15 18:03:23 +0800 |
|---|---|---|
| committer | Jimmy Chen <jimmycmchen@google.com> | 2019-10-08 14:37:19 +0800 |
| commit | bcd86d0c9bd34d46dbf3f248dbc4e4964a9731e4 (patch) | |
| tree | 5533323e89cdf866b01c546b0ba2fea2b2285ec9 /services/net/java | |
| parent | df2293f68b641ae0f3775c60f8b31624c5fd2e92 (diff) | |
p2p: mirgrate p2p into tethering modes
Bug: 137602441
Bug: 139783330
Test: atest FrameworksNetTests
Test: atest FrameworksWifiTests
Test: CtsVerifier - Wi-Fi Direct
Test: Enable hotspot when P2P GO is running
* P2P GO is terminated
* hotspot is running
Test: Enable P2P GO when hotspot is running
* hotspot is intact
* P2P GO could not be launched
Test: Verify P2P functions with legacy WifiP2pService
Change-Id: Icb2e2b106ae52b19af29b7a1ebc55d3cdf80db9c
Diffstat (limited to 'services/net/java')
| -rw-r--r-- | services/net/java/android/net/ip/IpServer.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/services/net/java/android/net/ip/IpServer.java b/services/net/java/android/net/ip/IpServer.java index 6a6a1307723e..3d79bba7bbe3 100644 --- a/services/net/java/android/net/ip/IpServer.java +++ b/services/net/java/android/net/ip/IpServer.java @@ -93,6 +93,8 @@ public class IpServer extends StateMachine { private static final int USB_PREFIX_LENGTH = 24; private static final String WIFI_HOST_IFACE_ADDR = "192.168.43.1"; private static final int WIFI_HOST_IFACE_PREFIX_LENGTH = 24; + private static final String WIFI_P2P_IFACE_ADDR = "192.168.49.1"; + private static final int WIFI_P2P_IFACE_PREFIX_LENGTH = 24; // TODO: have PanService use some visible version of this constant private static final String BLUETOOTH_IFACE_ADDR = "192.168.44.1"; @@ -403,6 +405,9 @@ public class IpServer extends StateMachine { } else if (mInterfaceType == ConnectivityManager.TETHERING_WIFI) { ipAsString = getRandomWifiIPv4Address(); prefixLen = WIFI_HOST_IFACE_PREFIX_LENGTH; + } else if (mInterfaceType == ConnectivityManager.TETHERING_WIFI_P2P) { + ipAsString = WIFI_P2P_IFACE_ADDR; + prefixLen = WIFI_P2P_IFACE_PREFIX_LENGTH; } else { // BT configures the interface elsewhere: only start DHCP. final Inet4Address srvAddr = (Inet4Address) numericToInetAddress(BLUETOOTH_IFACE_ADDR); |