Merge "Merge "Support IPv6 Bluetooth tethering" am: b4f69b3cd0 am: fa2c8c571b"... (ee1bcb6d) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/connectivity/tethering/IPv6TetheringCoordinator.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package com.android.server.connectivity.tethering;

		import android.net.ConnectivityManager;
		import android.net.IpPrefix;
		import android.net.LinkAddress;
		import android.net.LinkProperties;
		@@ -164,11 +163,6 @@ public class IPv6TetheringCoordinator {
		}

		private LinkProperties getInterfaceIPv6LinkProperties(IpServer ipServer) {
		if (ipServer.interfaceType() == ConnectivityManager.TETHERING_BLUETOOTH) {
		// TODO: Figure out IPv6 support on PAN interfaces.
		return null;
		}

		final Downstream ds = findDownstream(ipServer);
		if (ds == null) return null;