Merge "Tethering: Add WiGig support" am: 65fadfc134 am: 6c5b5b0803 am: 788394b3e6 am: 9682631e83 (38b39bd3) · Commits · e / os / android_frameworks_base

packages/Tethering/common/TetheringLib/src/android/net/TetheringManager.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -171,6 +171,14 @@ public class TetheringManager {
		*/
		public static final int TETHERING_ETHERNET = 5;

		/**
		* WIGIG tethering type. Use a separate type to prevent
		* conflicts with TETHERING_WIFI
		* This type is only used internally by the tethering module
		* @hide
		*/
		public static final int TETHERING_WIGIG = 6;

		/** @hide */
		@Retention(RetentionPolicy.SOURCE)
		@IntDef(value = {

+7 −0

Original line number	Diff line number	Diff line
		@@ -42,6 +42,13 @@
		<item>"softap\\d"</item>
		</string-array>

		<!-- List of regexpressions describing the interface (if any) that represent tetherable
		WiGig interfaces. If the device doesn't want to support tethering over WiGig this
		should be empty. An example would be "wigig\\d" -->
		<string-array translatable="false" name="config_tether_wigig_regexs">
		<item>"wigig\\d"</item>
		</string-array>

		<!-- List of regexpressions describing the interface (if any) that represent tetherable
		Wifi P2P interfaces. If the device doesn't want to support tethering over Wifi P2p this
		should be empty. An example would be "p2p-p2p\\d-.*" -->

+1 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@
		<item type="array" name="config_tether_usb_regexs"/>
		<item type="array" name="config_tether_ncm_regexs" />
		<item type="array" name="config_tether_wifi_regexs"/>
		<item type="array" name="config_tether_wigig_regexs"/>
		<item type="array" name="config_tether_wifi_p2p_regexs"/>
		<item type="array" name="config_tether_bluetooth_regexs"/>
		<item type="array" name="config_tether_dhcp_range"/>

+2 −1

Original line number	Diff line number	Diff line
		@@ -617,7 +617,8 @@ public class IpServer extends StateMachine {
		final Boolean setIfaceUp;
		if (mInterfaceType == TetheringManager.TETHERING_WIFI
		\|\| mInterfaceType == TetheringManager.TETHERING_WIFI_P2P
		\|\| mInterfaceType == TetheringManager.TETHERING_ETHERNET) {
		\|\| mInterfaceType == TetheringManager.TETHERING_ETHERNET
		\|\| mInterfaceType == TetheringManager.TETHERING_WIGIG) {
		// The WiFi and Ethernet stack has ownership of the interface up/down state.
		// It is unclear whether the Bluetooth or USB stacks will manage their own
		// state.

+5 −1

Original line number	Diff line number	Diff line
		@@ -40,6 +40,7 @@ import static android.net.TetheringManager.TETHERING_NCM;
		import static android.net.TetheringManager.TETHERING_USB;
		import static android.net.TetheringManager.TETHERING_WIFI;
		import static android.net.TetheringManager.TETHERING_WIFI_P2P;
		import static android.net.TetheringManager.TETHERING_WIGIG;
		import static android.net.TetheringManager.TETHER_ERROR_INTERNAL_ERROR;
		import static android.net.TetheringManager.TETHER_ERROR_NO_ERROR;
		import static android.net.TetheringManager.TETHER_ERROR_SERVICE_UNAVAIL;
		@@ -495,7 +496,8 @@ public class Tethering {
		if (up) {
		maybeTrackNewInterfaceLocked(iface);
		} else {
		if (ifaceNameToType(iface) == TETHERING_BLUETOOTH) {
		if (ifaceNameToType(iface) == TETHERING_BLUETOOTH
		\|\| ifaceNameToType(iface) == TETHERING_WIGIG) {
		stopTrackingInterfaceLocked(iface);
		} else {
		// Ignore usb0 down after enabling RNDIS.
		@@ -517,6 +519,8 @@ public class Tethering {

		if (cfg.isWifi(iface)) {
		return TETHERING_WIFI;
		} else if (cfg.isWigig(iface)) {
		return TETHERING_WIGIG;
		} else if (cfg.isWifiP2p(iface)) {
		return TETHERING_WIFI_P2P;
		} else if (cfg.isUsb(iface)) {