Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2938999



Change-Id: If04a9159aa8ef65c7aef0d34505847812efe2f75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2927252



Change-Id: Id2ae051e1a86ba599d6e3ea3a7fc79e4953f5cb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2919875



Change-Id: I23779fdd2e7ca41f328c42b631d20b0841aa4216
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Address the remaining comments in aosp/2874718 to simplify the
burst time logic.

Bug: 271067818
Test: atest FrameworksNetTests NsdManagerTest
Change-Id: I619f45189b10da3e09759ee1d57a898173a9fff8

Pass buffer size to netlinkSocketForProto to allow callers to specify
buffer size. The buffer size is not set if 0 is passed in.

Following callers of netlinkSocketForProto passes SOCKET_RECV_BUFFERSIZE
to keep same behavior as before:
 * OffloadHardwareInterface.createConntrackSocket()
 * NetlinkUtils.sendOneShotKernelMessage()
 * IpSecXfrmController.Dependencies.newNetlinkSocket()
 * InetDiagMessage.getConnectionOwnerUid()
Following callers pass 0 to not update the buffer size:
 * TunInterfaceController - it uses the socket only for writing
 * NetlinkUtils.createNetLinkInetDiagSocket() same behavior as before
Added a SOCKET_DUMP_RECV_BUFFERSIZE of 128k to be used by socket
requesting dump information from kernel:
 * NetlinkUtils.getAndProcessNetlinkDumpMessages() - sends dump request
   and expecting multiple reply messages.

Bug: 320420453

Test: atest NetworkStaticLibTests
atest FrameworksNetTests

Change-Id: I3dcb76963cf2646eb311602b50ab4e44b8ad3e8f

Merge "Move the Thread proguard flags to ConnectivityService's proguard.flags" into main am: 96361bc4

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2926180



Change-Id: I26905bdd2b494883e500066b93631569080619c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2931454



Change-Id: Ib4af3dd17e2cce9301be59ff667af9c358fa228f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2935111



Change-Id: Ib180864bbf930ebef7ac4f3acdf9cc4270451bfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2874718



Change-Id: I67d3d4b776dc81937a2b85301f688923bb86f688
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

The current query scan modes, active and passive, have
limitations. Unicast queries only originate from the first query
session, multicast queries should be sent simultaneously with
unicast, and both modes suffer from infrequent scans. To
address these shortcomings, a aggressive query mode is proposed.

Bug: 271067818
Test: atest FrameworksNetTests NsdManagerTest
Change-Id: I87100e03a5b6306dcae79f05c034f000e6dc2889

Test: TH
Fix: 299876562
Change-Id: I347a269889ea6cf39218b6322dcba92a14535e9c

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2926171



Change-Id: Ib98da56df6ec8fe05e436a2ac27ff1de100d46ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2921405



Change-Id: I616762ce1ca69231849b79d30677207e11aae066
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2929738



Change-Id: I3602dfbd9574cdb22dbb4a66daf15cb03063a5f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2928053



Change-Id: Icd14fbe9aff1755d47ff9a40b28db09536cd0300
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2931332



Change-Id: Icf119ca968541dfda95b48cfe21b3482a3691c48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2919205



Change-Id: I031320cf0b34b04cbd7278f97ad1c8e448837d4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

* changes:
  [mdns] avoid checking conflicts against the registration itself
  [mdns] stop MdnsAnnouncer when the registration has a conflict

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2929737



Change-Id: Ie20b016e636805c1709c48ba94623b6ed7edec3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

If a service is found without a requested subtype, then updated to have
that subtype, onServiceUpdated would be sent instead of onServiceFound.

Fix this by tracking which services have been found by each listener, as
whether a service is newly found or updated depends on the options (in
this case the subtype filter) of each listener.

Fixes: 317167170
Test: atest
Change-Id: If8dbe04d858082a872c0f068433a3680331c670b

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2890958



Change-Id: Ia51b96f7d1171730ff7f84afd26f22e09a3f05d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2929831



Change-Id: Id55c0e3a471025aa70026f7716a0e11cecedbba0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Bug: 322734489
Change-Id: I9f6c781513a749c9e3953e8bad85b5ebaad776fa

* changes:
  [mdns] service-side impl for custom host
  [mdns] add API support for custom hostname

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2931330



Change-Id: I7712fb29e6d14ffd8d84bcacae693f557ff09c9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>