With the release cut of the July train and the recent automerger
cutover, tm-mainline-prod is now officially an abandoned branch.

This change deletes (most) infrastructure that was put in place to
disable cronet on tm-mainline-prod.

Test: builds
Bug: 278639767
(cherry picked from https://android-review.googlesource.com/q/commit:2e3e2955b8cf7ba181788140dd62b2dd20e7b600)
Merged-In: I078f2114b736a634f08d8f704c19beb2224ef645
Change-Id: I078f2114b736a634f08d8f704c19beb2224ef645

[automerger skipped] Merge "[DO NOT MERGE] Check Sdk level before calling the DeviceConfig API" into tm-mainline-prod am: ff60f776 -s ours

am skip reason: subject contains skip directive

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



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

[automerger skipped] [DO NOT MERGE] Check Sdk level before calling the DeviceConfig API am: 1d6c5260 -s ours

am skip reason: subject contains skip directive

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



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

Use type + scope as key to build cached address map so that
SAP (key: TETHERING_WIFI + INTERNET) and LOHS
(key: TETHERING_WIFI + LOCAL) can use different address.

Bug: 233175023
Test: atest TetheringTests
(cherry picked from https://android-review.googlesource.com/q/commit:49649c9aeac709abaeb345f89b6a3a0e5a279435)
Merged-In: I46a4b3ee919628092b7540202a43d79f407b09b6
Change-Id: I46a4b3ee919628092b7540202a43d79f407b09b6

This change store localOnly wifi clients in its own field so that
tethered and localOnly hotspot clients can exist at the same time.

Currently, there are no tethered and localOnly hotspot clients at
the same time because PrivateAddressCoordinator does not support
SAP + LOHS. A follow-up change will be made to allow this.

When both SAP and LOHS are enabled, the SAP and LOHS clients from
TetheringEventCallback#onClientsChanged are all TETHERING_WIFI.
Currently, there is no way for the listeners to distinguish between
SAP and LOHS clients.

Bug: 233175023
Test: atest TetheringTests
(cherry picked from https://android-review.googlesource.com/q/commit:ae3abdfa4be2e4867d4cad70be15f90ad36a0b32)
Merged-In: I01b0a6abb084f7135f7825e0c5303e49c16a4c39
Change-Id: I01b0a6abb084f7135f7825e0c5303e49c16a4c39

As the suggestion from:
https://android-review.git.corp.google.com/c/platform/packages/modules/Connectivity/+/2489359/9/Tethering/src/android/net/ip/IpServer.java#b1176

Make BaseServingState an abstract class to prevent it from being used
directly. Additionally, move the handleNewPrefixRequest method into
BaseServingState because it is the only class that uses it.
To avoid TetheredState and LocalHotspotState from having to implement
their own enter function, add the mDesiredInterfaceState field to
BaseServingState.

Bug: 233175023
Test: atest TetheringTests
(cherry picked from https://android-review.googlesource.com/q/commit:3ec851ef03d60308a9ecc57557f378a186bb9ac0)
Merged-In: I03269c37e666345efb0c61039a2bb213f223a5a2
Change-Id: I03269c37e666345efb0c61039a2bb213f223a5a2

Test: this
Bug: 238696406
(cherry picked from https://android-review.googlesource.com/q/commit:16e41d130c99edcd222277381af96f82685579bb)
Merged-In: Ife6500daae58b7f85a7f4c76cd89ce91def5e78c
Change-Id: Ife6500daae58b7f85a7f4c76cd89ce91def5e78c

Patched from ag/23208840

Bug: 282106309
Test: -m
Ignore-AOSP-First: nearby_not_in_aosp_yet
Change-Id: I5ed80f62d68ed5fb93fa6d182a4c2825cdb6b26d

Recently, new test methods were added to NetworkAgentTest which
fail in instant mode because they are not marked @AppModeFull.

Because instant apps can't use NetworkAgent (it's a system API,
and it needs the NETWORK_FACTORY permission which is signature
only), just mark the whole test @AppModeFull so this cannot
happen again.

Bug: 283897713
Test: test is skipped in instant mode
(cherry picked from https://android-review.googlesource.com/q/commit:f1a61ad83de462dcd149ca53f0d417486ca1aec0)
Merged-In: Ib6ff07d9fdc329d3421a077532b8a434323053f8
Change-Id: Ib6ff07d9fdc329d3421a077532b8a434323053f8
Skip all of NetworkAgentTest in instant mode.

Recently, new test methods were added to NetworkAgentTest which
fail in instant mode because they are not marked @AppModeFull.

Because instant apps can't use NetworkAgent (it's a system API,
and it needs the NETWORK_FACTORY permission which is signature
only), just mark the whole test @AppModeFull so this cannot
happen again.

Fix: 283897713
Test: test is skipped in instant mode
Change-Id: Ib6ff07d9fdc329d3421a077532b8a434323053f8

There are multiple independent reasons a keepalive can stop. Some
are software (e.g. the app stops the keepalive) and some are hardware
(e.g. the SIM card gets removed). Therefore, there is a very low
probability that both of these happen at the same time, which would
result in the first stop attempt returning SUCCESS and the second
stop attempt returning NO_SUCH_SLOT. Such a race condition can be
ignored with a log, not to crash the system. Change to wtf log so
that the issue could still be visible since this implies possible
bugs in the system.

Also update the javadoc for SocketKeepalive.ERROR_NO_SUCH_SLOT.

Bug: 281484381
Test: atest FrameworksNetTests
(cherry picked from https://android-review.googlesource.com/q/commit:75673ba5025faa191ae188100b117a4095fab8ab)
Merged-In: I316a2193fc7302b04e074ff0b03dc43946fe5ce6
Change-Id: I316a2193fc7302b04e074ff0b03dc43946fe5ce6

Test: TH
(cherry picked from https://android-review.googlesource.com/q/commit:a7994902d90b0273bca86196441758ce03af2ca2)
Merged-In: I541d015732179313a34872d3fdbeff636047c49b
Change-Id: I541d015732179313a34872d3fdbeff636047c49b
Bug: 283523051

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



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

to make sure a mainline update doesn't break devices in the field

Test: TreeHugger
Bug: 268479036
Signed-off-by: Maciej Żenczykowski <maze@google.com>
(cherry picked from https://android-review.googlesource.com/q/commit:f7939fa8d1c4566d056a8501e610c8fe18ac98f8)
Merged-In: Iadcd861509d31b3ed6352d452a159cd89af479dd
Change-Id: Iadcd861509d31b3ed6352d452a159cd89af479dd

Starting with U, only explicit intents will be allowed to
launch non-exported internal components. Set package name
to entitlement recheck intent so that the intent could be
delivered to tethering itself successfully.

Bug: 278482046
Test: atest TetheringTests
      manual verify entitlement recheck work in U
(cherry picked from https://android-review.googlesource.com/q/commit:e86fb5ef56be064839a639702bbe376448f08bed)
Merged-In: Ife30eee13fe39509ccb5786d2a76fbb7baa022a8
Change-Id: Ife30eee13fe39509ccb5786d2a76fbb7baa022a8

Test: -m
Ignore-AOSP-First: nearby_not_in_aosp_yet
Fix: 273887455
Bug: 283345506
Change-Id: I6aef6fd9c91eaa73419261ee477099cebc5bdc1a

am skip reason: subject contains skip directive

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



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

am skip reason: subject contains skip directive

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



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

* changes:
  Stop MdnsServiceTypeClient send on socket destroy
  Do not send socket destroyed on unregistration

* changes:
  Fix agents disconnecting in SUSPENDED state.
  Check clatd does not stop when suspended network is disconnected

Wifi remembers the wifi enabled state under airplane mode in the
Settings.Secure.WIFI_APM_STATE setting for the airplane mode
enhancement. Wifi will not be disconnected if user enables
the wifi under airplane mode. This behavior breaks the
assumption in testSetAirplaneMode. The test expects to always
receive the WiFi network disconnect after turning airplane
mode on.

The wifi enhancement was done with hidden method which should not
be referred in the cts. The intention of testSetAirplaneMode was
to verify the permission required for setting ariplane mode.
This change should be no harm for original intention.

Bug: 282436851
Test: atest CtsNetTestCases
(cherry picked from https://android-review.googlesource.com/q/commit:c346fc8a0d8330aa7cf033a8554233a90e683164)
Merged-In: I3458679378f0c12c26051f3dac7fcf155c1f469c
Change-Id: I3458679378f0c12c26051f3dac7fcf155c1f469c

Network state is not changed to disconnected when a networkagent
is disconnected and network state is SUSPENDED.

So the function requiresClat return true. Clat is not stoped.

Bug: 277682237
Test: atest FrameworksNetTests
(cherry picked from https://android-review.googlesource.com/q/commit:fd5d3d90e1da7411104902ddfe859ebd0e4a02fb)
Merged-In: I5edfcf64aca5d2d34325d722dd29fab41bcf2600
Change-Id: I5edfcf64aca5d2d34325d722dd29fab41bcf2600

Currently, clatd is not stopped when suspended network is disconnected
and aosp/2583410 fixes this issue.
This CL adds test for current behavior, aosp/2583410 can update
testDisconnectSuspendedNetworkStopClatd to call verifyClatdStop instead
of verifyNeverClatdStop

Test: atest FrameworksNetTests
Bug: 277682237
(cherry picked from https://android-review.googlesource.com/q/commit:4a5b06559fc276a06f53134694a0a6548b36b026)
Merged-In: I345e097ce8e114800d77c5f44d38d7ae4938935c
Change-Id: I345e097ce8e114800d77c5f44d38d7ae4938935c

Auto-generated-cl: translation import
Change-Id: Ia94ca5d2e562362f46942d024b02c7036797451f

Auto-generated-cl: translation import
Change-Id: I5d43bda306bbee6fcedc0a6b0b84eb3ae8d35da9

Auto-generated-cl: translation import
Change-Id: I09dc2ea724f57754d2ae420f29fca9b5f393d51f

[automerger skipped] Merge "LinkProperties: use ordered comparison for P-CSCFs." into tm-mainline-prod am: 11817f2b -s ours

am skip reason: Merged-In Ia1884f37739a20d871dd0024cc72cb18c083dc8e with SHA-1 78b8ff84 is already in history

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



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

* changes:
  [automerge] LinkProperties: use ordered comparison for P-CSCFs. 2p: 78b8ff84
  LinkProperties: use ordered comparison for P-CSCFs.

MdnsServiceTypeClient should stop sending when it is removed due to its
socket being destroyed.

On null networks (downstream interfaces) that may have multiple sockets,
this should only happen once the last socket used by the (null) network
has been destroyed.

Bug: 278635632
Test: atest
(cherry picked from https://android-review.googlesource.com/q/commit:3d66b0432d0f83249d18ffaa757103129359d115)
Merged-In: Ie1808840bd68678f2af7b71bdd8f3be377c14424
Change-Id: Ie1808840bd68678f2af7b71bdd8f3be377c14424

When a SocketCallback is unregistered from MdnsSocketProvider, do not
send socket destroyed callbacks. Callers may not expect getting
callbacks after unregistration, and the current callbacks are also
broken when an unrequested socket is still in use by another requester.

MdnsAdvertiser already does not depend on getting this callback, as it
only unregisters the SocketCallback after it is done using the socket.
This change fixes MdnsMultinetworkSocketClient to destroy the socket by
itself when unrequesting.

Bug: 276177548
Test: atest
(cherry picked from https://android-review.googlesource.com/q/commit:5fe9bacc63c1b6a77878f23d5f53a07fc482f354)
Merged-In: If95f833e293f3aab91128aab1c9852ebfd41995d
Change-Id: If95f833e293f3aab91128aab1c9852ebfd41995d

* changes:
  Implement proper subtype advertising
  Implement proper discovery with subtypes
  Remove the ServiceTypeClient after socket destroyed