| commit | fa62d9b7381e5e30e78a955a9d79ecbf8d4698d9 | [log] [tgz] |
|---|---|---|
| author | James Mattis <jmattis@google.com> | Thu Jun 17 16:27:27 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 17 16:27:27 2021 +0000 |
| tree | eb71832f7873e7ab6833abad6b4e528dceb99d71 | |
| parent | 57fa1f6fa72ed18feac0d11eeaa84a3d55ccd8f8 [diff] | |
| parent | fae64aa5683707cd228a952aaa9d6dc1203983c7 [diff] |
[automerger skipped] Merge "Update TestNetworkTracker tearDown()" into sc-dev am: f744e7681f -s ours am skip reason: Merged-In I5ba142f601f3942d6e6ec4106fc0e70012b42a49 with SHA-1 72e4d0f458 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/net/+/14992223 Change-Id: I1cd5381677240037c9c063967e55c37db72bd783
diff --git a/staticlibs/device/com/android/net/module/util/structs/NsHeader.java b/staticlibs/device/com/android/net/module/util/structs/NsHeader.java index 6e0aa50..2e8b77b 100644 --- a/staticlibs/device/com/android/net/module/util/structs/NsHeader.java +++ b/staticlibs/device/com/android/net/module/util/structs/NsHeader.java
@@ -50,8 +50,12 @@ @Field(order = 1, type = Type.Ipv6Address) public Inet6Address target; - public NsHeader(final Inet6Address target) { - this.reserved = 0; + NsHeader(int reserved, final Inet6Address target) { + this.reserved = reserved; this.target = target; } + + public NsHeader(final Inet6Address target) { + this(0, target); + } }