From dc6690867bbe839bbabddd9d7d5e4ec887a2bfee Mon Sep 17 00:00:00 2001 From: Lorenzo Colitti Date: Tue, 28 Oct 2014 15:24:03 +0900 Subject: Enable 464xlat on wifi. Bug: 12111730 Change-Id: If6d118a3c6e163262b09cc2fb3e3d3f9a81986ec --- services/core/java/com/android/server/connectivity/Nat464Xlat.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'services') diff --git a/services/core/java/com/android/server/connectivity/Nat464Xlat.java b/services/core/java/com/android/server/connectivity/Nat464Xlat.java index c145ca3..576556b 100644 --- a/services/core/java/com/android/server/connectivity/Nat464Xlat.java +++ b/services/core/java/com/android/server/connectivity/Nat464Xlat.java @@ -91,8 +91,9 @@ public class Nat464Xlat extends BaseNetworkObserver { final boolean connected = nai.networkInfo.isConnected(); final boolean hasIPv4Address = (nai.linkProperties != null) ? nai.linkProperties.hasIPv4Address() : false; - // Only support clat on mobile for now. - return netType == TYPE_MOBILE && connected && !hasIPv4Address; + // Only support clat on mobile and wifi for now, because these are the only IPv6-only + // networks we can connect to. + return connected && !hasIPv4Address && (netType == TYPE_MOBILE || netType == TYPE_WIFI); } /** -- cgit v1.1