diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2014-10-28 15:24:03 +0900 |
|---|---|---|
| committer | Lorenzo Colitti <lorenzo@google.com> | 2014-10-30 20:31:27 +0900 |
| commit | dc6690867bbe839bbabddd9d7d5e4ec887a2bfee (patch) | |
| tree | 67a84983333c4face03803aa7e8aa75e55986df2 /services | |
| parent | e21a26b3ba78b0238f4ed4a09b43319a2320fbaa (diff) | |
| download | frameworks_base-dc6690867bbe839bbabddd9d7d5e4ec887a2bfee.zip frameworks_base-dc6690867bbe839bbabddd9d7d5e4ec887a2bfee.tar.gz frameworks_base-dc6690867bbe839bbabddd9d7d5e4ec887a2bfee.tar.bz2 | |
Enable 464xlat on wifi.
Bug: 12111730
Change-Id: If6d118a3c6e163262b09cc2fb3e3d3f9a81986ec
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/connectivity/Nat464Xlat.java | 5 |
1 files changed, 3 insertions, 2 deletions
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); } /** |