joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "To support skip464xlat per Network" am: 698b80818c

Browse source 
am: e826aa52e4

Change-Id: I944738258051525b371bd17dd3ee7b411b82d12b
This commit is contained in:
Chalard Jean 2018-10-24 17:19:51 -07:00 • committed by android-build-merger
commit 426e1cca1a
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
core/java/android/net/NetworkMisc.java
View file

@ -65,6 +65,12 @@ public class NetworkMisc implements Parcelable {
*/
public String subscriberId;
/**
* Set to skip 464xlat. This means the device will treat the network as IPv6-only and
* will not attempt to detect a NAT64 via RFC 7050 DNS lookups.
*/
public boolean skip464xlat;
public NetworkMisc() {
}
@ -75,6 +81,7 @@ public class NetworkMisc implements Parcelable {
acceptUnvalidated = nm.acceptUnvalidated;
subscriberId = nm.subscriberId;
provisioningNotificationDisabled = nm.provisioningNotificationDisabled;
skip464xlat = nm.skip464xlat;
}
}
@ -90,6 +97,7 @@ public class NetworkMisc implements Parcelable {
out.writeInt(acceptUnvalidated ? 1 : 0);
out.writeString(subscriberId);
out.writeInt(provisioningNotificationDisabled ? 1 : 0);
out.writeInt(skip464xlat ? 1 : 0);
}
public static final Creator<NetworkMisc> CREATOR = new Creator<NetworkMisc>() {
@ -101,6 +109,7 @@ public class NetworkMisc implements Parcelable {
networkMisc.acceptUnvalidated = in.readInt() != 0;
networkMisc.subscriberId = in.readString();
networkMisc.provisioningNotificationDisabled = in.readInt() != 0;
networkMisc.skip464xlat = in.readInt() != 0;
return networkMisc;
}