Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 2d2a69b2: Merge "Enable 464xlat on wifi." into lmp-mr1-dev

Browse Source 
* commit '2d2a69b2d3c03daa167fa1daba590a42dd3c3002':
  Enable 464xlat on wifi.
This commit is contained in:
Lorenzo Colitti
2014-10-30 13:33:59 +00:00
committed by Android Git Automerger
parent f2c9094293 2d2a69b2d3
commit 1a9864db0a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/connectivity/Nat464Xlat.java
View File

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