To merge the framework-connectivity and framework-connectivity.impl
targets, framework-connectivity stubs need to be referenced explicitly
in java_sdk_libraries, otherwise the build system will currently see
dependency cycles.

Bug: 183600168
Test: m
Ignore-AOSP-First: Needs manual cherry-picks
Change-Id: I556747f9ba934f8b44b6ea9a518adbccc84ac2a9

am skip reason: skip tag Change-Id I4bc0daf5ad9e4b4043f4a897ddab16aec8f8a536 with SHA-1 41918d6c is already in history

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

Change-Id: I056312ed3ec9c22854a09fa2f75cacca19c07e03

am skip reason: skip tag Change-Id I4bc0daf5ad9e4b4043f4a897ddab16aec8f8a536 with SHA-1 41918d6c is already in history

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

Change-Id: I27f39c91f81a25cc03dbcc99b4b22569128b5eb9

am skip reason: skip tag Change-Id I2550cb3ddd9c72c12de0dbf9baf32eec6fa3b151 with SHA-1 00950274 is already in history

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

Change-Id: I9e89c1a6e81b97e37254a23a4c4e28356836b77a

am skip reason: skip tag Change-Id I4bc0daf5ad9e4b4043f4a897ddab16aec8f8a536 with SHA-1 c1f14634 is already in history

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

Change-Id: I01b4b6925c5976899584d663963b354b193e096e

am skip reason: skip tag Change-Id I4bc0daf5ad9e4b4043f4a897ddab16aec8f8a536 with SHA-1 41918d6c is already in history

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

Change-Id: I9e82ec7ffc167bb5a48b3d5c1f7ff350be61479c

The parameter of NetworkCapabilities.setUids() and
NetworkRequest.Builder.setUids() are updated to take a set of
integer Range instead of a set of UidRange because of refactor
work for the incoming connectivity mainline module.

The parameter change stops NetworkRequestTest to work in the
different API levels. Replace the usage with shims to work in
both current and stable APIs.

Bug: 172183305
Test: atest FrameworksNetTests CtsNetTestCasesLatestSdk
Merged-In: I4bc0daf5ad9e4b4043f4a897ddab16aec8f8a536
Merged-In: I2550cb3ddd9c72c12de0dbf9baf32eec6fa3b151
Change-Id: I90b3384d2a78275df9f8717dba9d654eb82036bd

The parameter of NetworkCapabilities.setUids() and
NetworkRequest.Builder.setUids() are updated to take a set of
integer Range instead of a set of UidRange because of refactor
work for the incoming connectivity mainline module.

The parameter change stops NetworkRequestTest to work in the
different API levels. Replace the usage with shims to work in
both current and stable APIs.

Bug: 172183305
Test: atest FrameworksNetTests CtsNetTestCasesLatestSdk
Merged-In: I4bc0daf5ad9e4b4043f4a897ddab16aec8f8a536
Change-Id: I2550cb3ddd9c72c12de0dbf9baf32eec6fa3b151

[automerger skipped] Merge "Shorten the name for the dump file." am: a7542972 am: 3935ac08 am: 9d3174e4 -s ours

am skip reason: skip tag Change-Id Ic0f87b97bb58e115fe81e2d688ce0e633397da42 with SHA-1 2b573516 is already in history

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

Change-Id: I6c7b77dfd766e7c8deec293a437d49e059fd85f3

[automerger skipped] Merge "Shorten the name for the dump file." am: a7542972 am: 3935ac08 am: d802f489 -s ours

am skip reason: skip tag Change-Id Ic0f87b97bb58e115fe81e2d688ce0e633397da42 with SHA-1 2b573516 is already in history

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

Change-Id: Ie3c654e53d42ac4de12aed66aa7ec74373e2c929

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

Change-Id: Ia73a8459e6bba6f24fc1f40cdb8cfb3177d9f9bb

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

Change-Id: Ifb3ab6932f7c562456379f960c18a57ce03e11eb

[automerger skipped] Try reconnecting to wifi if it doesn't automatically connect. am: 8bb9eb19 am: bc0ca639 am: 81330c83 -s ours

am skip reason: skip tag Change-Id I31fb127ef333d39fe4697043876c7cef15d525e3 with SHA-1 aae0d619 is already in history

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

Change-Id: Ib7e2365f676ef63f46b88a5d3e64c6aa29a17e37

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

Change-Id: I11f5ca67a111e7d923310b68d90f66ef383d015a

[automerger skipped] Try reconnecting to wifi if it doesn't automatically connect. am: 8bb9eb19 am: bc0ca639 am: e2a70936 -s ours

am skip reason: skip tag Change-Id I31fb127ef333d39fe4697043876c7cef15d525e3 with SHA-1 aae0d619 is already in history

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

Change-Id: I989eba23f64e3587f539e318ee70b0b491fe5ee5

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

Change-Id: Ibcd508be488d90fa147587dbc45de9a7066c8b8b

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

Change-Id: Ief4defadb6e4f5b45a7ef3d3022953244eca4788

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

Change-Id: I06fc9f6273a947811c97be0da2a642b078a372c2

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

Change-Id: Ida43263266b11d1a8e8df40f90d7b9d57c146339

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

Change-Id: I2e0c1d036bd8907df22eb98fa3d4a1218c5cfdc0

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

Change-Id: I7789fd1cfab1516948d93ab4e8cbf0882faee082

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

Change-Id: I3fe91bf6dd3c451aa01fbd5fcc290e8125adc43b

When meteredness of wifi changes during test, wifi disconnects.
Try reconnecting if it automatically connects after this.
Also, change the way we update metereness so that we can
use callback mechanism to wait for the state change instead of
polling for it regularly.

Bug: 181686645
Test: atest ./tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Merged-In: I31fb127ef333d39fe4697043876c7cef15d525e3
Change-Id: Icc0b37730201aebeab2713c6527a3195f6dcf97d

The file name is getting truncated by tradefed and
we are missing the information to actually idenity
the test. So, instead shorten the filename to preserve
the test name.

Test: atest ./tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Ignore-AOSP-First: Submitting internally first to avoid merge conflicts.
Merged-In: Ic0f87b97bb58e115fe81e2d688ce0e633397da42
Change-Id: I6ce3fc662782de82d8cad95414e24204b5f7f130

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

Change-Id: I6fcb53be747a5e95d58f2d84b16214cf9607a3d0

In S, instant apps can no longer access the system service that
backs the VPN APIs, so these tests started to fail in instant
mode.

Regardless of that change in S, though, instant apps cannot
create VPNs because they cannot access the package manager.

Previously, the tests were only passing because they did not
check that the VPN would actually work, they only checked that
the VPN API calls failed.

Fix: 181575083
Test: atest --instant CtsNetTestCases:VpnServiceTest
Change-Id: Idd35051bd1c908a8b85c02e8d0c54d3dea2dde38

[automerger skipped] Merge "Revert^2 "Replace the usage of UidRange"" am: bf0c19e5 -s ours am: 1baa39f7 -s ours am: 3e0e2d99 -s ours

am skip reason: skip tag Change-Id I4bc0daf5ad9e4b4043f4a897ddab16aec8f8a536 with SHA-1 41918d6c is already in history

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

Change-Id: I2faee160c607f6784eb2fc2f951a638c2caecc18

[automerger skipped] Move connectivity AIDLs to android.net am: cc305b2f am: 1feb0c30 am: 7c031b31 -s ours

am skip reason: skip tag Change-Id I23feb26c5de2fd7a4177797a3bc1d0dcbef4ade7 with SHA-1 9cb8dfc1 is already in history

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

Change-Id: Ia5ece90fe5ac9e9bb745964577c6e9ab2e8f0d53

[automerger skipped] Merge "Revert^2 "Replace the usage of UidRange"" am: bf0c19e5 -s ours am: 1baa39f7 -s ours am: c4d114ad -s ours

am skip reason: skip tag Change-Id I4bc0daf5ad9e4b4043f4a897ddab16aec8f8a536 with SHA-1 41918d6c is already in history

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

Change-Id: Iae701c502dd7c17b33b8b3efaca38a632a71af0c

[automerger skipped] Move connectivity AIDLs to android.net am: cc305b2f am: 1feb0c30 am: ddd1a6b4 -s ours

am skip reason: skip tag Change-Id I23feb26c5de2fd7a4177797a3bc1d0dcbef4ade7 with SHA-1 9cb8dfc1 is already in history

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

Change-Id: I86a18da2694561794d1f9d6f1995bd6c854da48a

[automerger skipped] Merge "Revert^2 "Replace the usage of UidRange"" am: bf0c19e5 -s ours am: 1baa39f7 -s ours

am skip reason: skip tag Change-Id I4bc0daf5ad9e4b4043f4a897ddab16aec8f8a536 with SHA-1 c1f14634 is already in history

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

Change-Id: I301142303402edb2a801014b937b5fbc37d1a8c7

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

Change-Id: I45bfb05a3091d322b3395907d87334d406fee1cc

[automerger skipped] Merge "Revert^2 "Replace the usage of UidRange"" am: bf0c19e5 -s ours am: 1baa39f7 -s ours

am skip reason: skip tag Change-Id I4bc0daf5ad9e4b4043f4a897ddab16aec8f8a536 with SHA-1 c1f14634 is already in history

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

Change-Id: I169190c331866089d76ba64faebc309dae827239

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

Change-Id: Ifd637a65600cc1185d27b15e486fcaeb83b244db

am skip reason: skip tag Change-Id I4bc0daf5ad9e4b4043f4a897ddab16aec8f8a536 with SHA-1 c1f14634 is already in history

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

Change-Id: Id633ed17067ec06bb2a296d9e6c07a11db47978b