LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Lorenzo Colitti
2014-10-30 13:27:56 +00:00
committed by Android (Google) Code Review
parent 35bffcdd58 9a66159292
commit 1b11eb6480
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 connected = nai.networkInfo.isConnected();
final boolean hasIPv4Address = final boolean hasIPv4Address =
(nai.linkProperties != null) ? nai.linkProperties.hasIPv4Address() : false; (nai.linkProperties != null) ? nai.linkProperties.hasIPv4Address() : false;
// Only support clat on mobile for now. // Only support clat on mobile and wifi for now, because these are the only IPv6-only
return netType == TYPE_MOBILE && connected && !hasIPv4Address; // networks we can connect to.
return connected && !hasIPv4Address && (netType == TYPE_MOBILE || netType == TYPE_WIFI);
} }
/** /**