[automerger skipped] Merge "Skip testPhysicalEthernet if the test run adb over network" into rvc-dev am: a973bf1a56 -s ours

am skip reason: Change-Id I57d365d33316881c50c3bf7fd1c98926d10842d3 with SHA-1 37ad92e0 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12105761

Change-Id: Id285ac8febcc062375bda7c95ba824dc9dd4d3bf

If the test run adb over network and ethernet is available, it is likely
that adb may run over ethernet. Then the test would fail because adb
would break when ethernet is switching from client mode to server mode.

Bug: 160389275
Test: atest CtsTetheringTest

Merged-In: I57d365d33316881c50c3bf7fd1c98926d10842d3
Change-Id: I57d365d33316881c50c3bf7fd1c98926d10842d3

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354445

Change-Id: I5e91a05d90f5f05cdbe7e7b30945d80832759bd2

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354445

Change-Id: I0d6eb8195743a6318c5adabb26d837ae35236c0d

[automerger skipped] Merge "Revert "Move Inet[4]AddressUtils to libs/net"" am: 55d6e27887 am: 0052646b -s ours

am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 2e342b86 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354443

Change-Id: Ie3cef51a714de2c9111554c84a5e7aba49a4818f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354443

Change-Id: I472fd717d82304e4362c3075805b460b02a197e0

This reverts commit cf86031c.

Reason for revert: Breaks the build b/160390899

Merged-In: Icd141a992c46290c74929785e261a1cd57bc001b
Change-Id: Ie10e66f61393602f17fbb61bf17230b176bf1f44

If the test run adb over network and ethernet is available, it is likely
that adb may run over ethernet. Then the test would fail because adb
would break when ethernet is switching from client mode to server mode.

Bug: 160389275
Test: atest CtsTetheringTest

Change-Id: I57d365d33316881c50c3bf7fd1c98926d10842d3

[automerger skipped] Merge "Move Inet[4]AddressUtils to libs/net" am: 5bc91ca167 am: e4116cf3 -s ours

am skip reason: Change-Id I7074651c6a2a7a6b11bcf13cc4bb03833d7d655f with SHA-1 e10b80de is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1324109

Change-Id: Iae9c8eb2e17130737e4cd30b03c4d20afbae6dc8

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1324109

Change-Id: I51d32e4efd0d9fc458b02022b6308920f7c812a9

The classes should not be picked up from frameworks/base, as they are
part of several mainline modules.

Also refine comments in DhcpResults following feedback in previous
change.

(cherry-pick from internal branch skipping wifi classes; no other
conflict)

Bug: 151052811
Test: m; manual: flashed, wifi and telephony working
Test: atest NetworkStackCoverageTests
Merged-In: I7074651c6a2a7a6b11bcf13cc4bb03833d7d655f

Change-Id: I7074651c6a2a7a6b11bcf13cc4bb03833d7d655f

[automerger skipped] Merge "Fix tethering jarjar rule for LocalLog" am: 5ac18c50 am: 13f66a7d -s ours

am skip reason: Change-Id I5f070b96f96aaabf7ec8da52a3d3444ed940fb56 with SHA-1 68393231 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1353287

Change-Id: I8940d70a097ca954ceec622ba42663a7fbf11c9c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1353287

Change-Id: Ia21b091951f7e5dd3f879d68414653a6c9ff8b25

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12040945

Change-Id: I8eec902878e34cb6a4ee7989d45cc0c7149c791c

LocalLog is in android.util* instead of android.net*.
No crash happened because the methods used by tethering are
@UnsupportedAppUsage.

Bug: 160113128
Test: atest TetheringTests
Change-Id: I5f070b96f96aaabf7ec8da52a3d3444ed940fb56

LocalLog is in android.util* instead of android.net*.
No crash happen becaue the methods used by tethering are
@UnsupportedAppUsage.

Bug: 160113128
Test: atest TetheringTests
(cherry-pick from internal branch with conflicts)
Merged-In: I5f070b96f96aaabf7ec8da52a3d3444ed940fb56

Change-Id: I5f070b96f96aaabf7ec8da52a3d3444ed940fb56

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1329013

Change-Id: I67e2d4facd77f978255a10423a9baff231ac0695

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1329013

Change-Id: I2d1886c4bc2892d3673e87544e3e9c2bb0bb8633

[automerger skipped] Merge "Use unstable networkstack AIDLs in development branches" am: cdf6b420 am: 9fba78c0 -s ours

am skip reason: Change-Id I74b4a16266bda7b8ac740b3a0193268da260fc2f with SHA-1 0d0ea272 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1343444

Change-Id: I86e4fca7fbec72a1cdbded8782afa22b211f2967

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1343444

Change-Id: Ib2a16bd545b98a8d95338f6acce23e265ec5130a

TetheringNotificationUpdater create a PendingIntent with
Intent#FLAG_ACTIVITY_NEW_TASK flag. But this flag is used for
Intent only. Thus, move this flag into Intent.

Bug: 158639789
Test: atest TetheringTests
Change-Id: I4c3af75c87b797bcde9356a94c835c7422dac1c6

[automerger skipped] Merge changes from topic "lnh-platform-split" am: c6b2c39d am: 9228c914 -s ours

am skip reason: Change-Id I7af128f42ae89a77a8e3fb113ea533331153c535 with SHA-1 864d304156 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348764

Change-Id: I3bb4fbb8c5c7df3f43bb69e1228848540e1249f9

am skip reason: Change-Id Icd06e9a315680c2251dbb9032a904dd6d66aa359 with SHA-1 697ec868 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348763

Change-Id: Ief614f159c1972c181986ae05b01b5dc2a92b1ee

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348764

Change-Id: Ie34095ddf885fcf57e2a7bcb89817485564e9100

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348763

Change-Id: I7511170930440ec5a1a8067b57a76a6c19484d71

* changes:
  Update to use nativehelper/JNIPlatformHelp.h
  Sync with libnativehelper refactoring

am skip reason: Change-Id I8841d91456952ded5efbf8ea221289aecc7746ad with SHA-1 8dd7e0a9 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348582

Change-Id: I4bddd1c6f072845f1a62812995a3b4cb4299ccaa

jniGetFDFromFileDescriptor() is now a legacy method and moved to a
separate header.

Bug: 151443957
Bug: 158749603
Test: m
Change-Id: Icd06e9a315680c2251dbb9032a904dd6d66aa359
Merged-In: Icd06e9a315680c2251dbb9032a904dd6d66aa359
Exempt-From-Owner-Approval: cherry pick
(cherry picked from commit a5c46825)

jniGetFDFromFileDescriptor() is now a legacy method and moved to a
separate header.

Bug: 151443957
Bug: 158749603
Test: m
Change-Id: Icd06e9a315680c2251dbb9032a904dd6d66aa359
Merged-In: Icd06e9a315680c2251dbb9032a904dd6d66aa359
Exempt-From-Owner-Approval: cherry pick
(cherry picked from commit a5c46825)

This class might be used by some mainline modules.

Bug: 151052811
Test: atest DnsPacketTest
Test: atest DnsResolverTest
(clean cherry-pick from internal branch)
Merged-In: I8841d91456952ded5efbf8ea221289aecc7746ad
Change-Id: I8841d91456952ded5efbf8ea221289aecc7746ad

am skip reason: Change-Id Iaf3e847e92f205b55f10fa85c17b9f3995d52099 with SHA-1 6b94c316 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11970745

Change-Id: Ib853e8dcf754451407ef858f3af766b9cab9696c

am skip reason: Change-Id Ic4d3aca0ed69234093af7f0206dab3335938c52a with SHA-1 6896f619 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11953638

Change-Id: I972b6d352b2c65f023b6a5239a32e9bfec573472

Send netlink request over fd for offload config before
completing init sequence. Provides existing conntrack
entries to IPA. Resolves issue where there are NAT
misses in IPA due to IPA only having the conntrack
entries added after tethering starts.

Bug: 149109043
Test: OffloadHardwareInterfaceTest
Original-Change: https://android-review.googlesource.com/1290954
Merged-In: Iaf3e847e92f205b55f10fa85c17b9f3995d52099
Change-Id: Iaf3e847e92f205b55f10fa85c17b9f3995d52099

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1290954

Change-Id: I5f976d70d87ef25ebb8e1483532781ac3d42425b