Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a9864db authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Android Git Automerger
Browse files

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

* commit '2d2a69b2':
  Enable 464xlat on wifi.
parents f2c90942 2d2a69b2

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

+3 −2
Original line number Diff line number Diff line
@@ -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);

    }



    /**