commit 4061f433223d5ec004e6e5f0e5b8ae4d49b4cfc7
author Lorenzo Colitti <lorenzo@google.com> Tue Oct 28 15:24:03 2014 +0900
committer Lorenzo Colitti <lorenzo@google.com> Thu Oct 30 20:31:27 2014 +0900
tree b7aa5d947bb8e6c7edd710b8f782f096afbab0f4
parent 475674dc24450f5df46af750854001650078b5ae

Enable 464xlat on wifi.

Bug: 12111730
Change-Id: If6d118a3c6e163262b09cc2fb3e3d3f9a81986ec

services/core/java/com/android/server/connectivity/Nat464Xlat.java

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 @@
         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);
     }
 
     /**