| commit | ab07d23ac3f216933d33ffc5d16d873c5af8f832 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Wed Jan 16 09:28:06 2019 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Jan 16 09:28:06 2019 +0000 |
| tree | f4f09bbad1fd5f6df57ef1fd64c4cff35b9706d5 | |
| parent | 202d9f183710643cb5f9635eedc0932c0db53e55 [diff] | |
| parent | 1098cc6470e2873228e094c27173c86f29951f0c [diff] |
Merge changes Iec53a9fd,Iac4cfe70 * changes: Test parceling empty LinkProperties. Delete the clatd functions from NetworkManagementService.
diff --git a/core/java/android/net/LinkProperties.java b/core/java/android/net/LinkProperties.java index 617125b..c2963fd 100644 --- a/core/java/android/net/LinkProperties.java +++ b/core/java/android/net/LinkProperties.java
@@ -191,6 +191,7 @@ } setMtu(source.mMtu); mTcpBufferSizes = source.mTcpBufferSizes; + mNat64Prefix = source.mNat64Prefix; } }