commit 1b11eb6480229e61c4778871417d5d57f94e9a01
author Lorenzo Colitti <lorenzo@google.com> Thu Oct 30 13:27:56 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 30 13:28:03 2014 +0000
tree 2f64d1f169bb1b1940b92354c2b3eafe00bc5001
parent 35bffcdd58c1249215a7090470dafd3bf6ef8d0b
parent 9a661592922b2408e7a0f20fee4c38876fb79f2f

Merge "Enable 464xlat on wifi." into lmp-mr1-dev

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