Victor Chang
9e360d16b5
[automerger skipped] Merge "Partial cherry-pick to remove IoUtils#deleteContents usage in FrameworksNetTests" into sc-dev am: e4132c8ca0 am: 25b288225b -s ours
...
am skip reason: Merged-In I5366e1cc9cd6ddb41f24718246381cc2b1cc1383 with SHA-1 fe20e1317d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15108481
Change-Id: I10f2769796cc170c3c3159a91d7a70cf253adac3
2021-06-29 08:57:35 +00:00
Victor Chang
25b288225b
Merge "Partial cherry-pick to remove IoUtils#deleteContents usage in FrameworksNetTests" into sc-dev am: e4132c8ca0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15108481
Change-Id: If24c0e920f55f5046fd2a93bfd16004c28f389df
2021-06-29 08:42:12 +00:00
Victor Chang
e4132c8ca0
Merge "Partial cherry-pick to remove IoUtils#deleteContents usage in FrameworksNetTests" into sc-dev
2021-06-29 08:12:04 +00:00
Remi NGUYEN VAN
d8e431c45d
[automerger skipped] Merge "Fix flakes in tests running after testIsPrivateDnsBroken" into sc-dev am: 64168015f1 -s ours am: eceaeb3ea3 -s ours
...
am skip reason: Merged-In Id9beba94e0fed85bd26c0509ad61369be794f3c3 with SHA-1 582770ce68 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15135741
Change-Id: I22a16d320ec500eda41e153c7ba15e4b5abc1356
2021-06-29 07:10:58 +00:00
Paul Duffin
76c8b61132
Merge "Enable tethering to perform its own hidden API processing" into sc-dev am: 4c94d16ced am: 65c5f4205b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15106963
Change-Id: I2ba42d5b6490053922f82928f0738f5785fdd469
2021-06-29 07:10:52 +00:00
Remi NGUYEN VAN
1f3e986044
[automerger skipped] Merge "Fix flakes in tests running after testIsPrivateDnsBroken" into sc-dev am: 64168015f1 am: f0a8dff500 -s ours
...
am skip reason: Merged-In Id9beba94e0fed85bd26c0509ad61369be794f3c3 with SHA-1 582770ce68 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15135741
Change-Id: I52c6976f473aaa730e3df0b32ce1dddeefde2532
2021-06-29 07:10:38 +00:00
Paul Duffin
9a72823e9f
Merge "Enable tethering to perform its own hidden API processing" into sc-dev am: 4c94d16ced am: 48edc6d921
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15106963
Change-Id: I70aaf23fd597c081c7f5f16cd0d075490bca65c8
2021-06-29 07:10:29 +00:00
Remi NGUYEN VAN
f0a8dff500
Merge "Fix flakes in tests running after testIsPrivateDnsBroken" into sc-dev am: 64168015f1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15135741
Change-Id: Ia82e72dce1742c122e711b4796db98feb6a53f24
2021-06-29 06:58:06 +00:00
Paul Duffin
48edc6d921
Merge "Enable tethering to perform its own hidden API processing" into sc-dev am: 4c94d16ced
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15106963
Change-Id: I2efd1b30cf614617861355b80abc4d526cc7a0bc
2021-06-29 06:57:52 +00:00
Remi NGUYEN VAN
eceaeb3ea3
[automerger skipped] Merge "Fix flakes in tests running after testIsPrivateDnsBroken" into sc-dev am: 64168015f1 -s ours
...
am skip reason: Merged-In Id9beba94e0fed85bd26c0509ad61369be794f3c3 with SHA-1 582770ce68 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15135741
Change-Id: Ic7c46d121b83eb531a8870a93f071bb1d0d1fcfb
2021-06-29 06:57:10 +00:00
Paul Duffin
65c5f4205b
Merge "Enable tethering to perform its own hidden API processing" into sc-dev am: 4c94d16ced
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15106963
Change-Id: Ia64cc9a69cea5a79861a5245447908f302ab4d24
2021-06-29 06:57:03 +00:00
Remi NGUYEN VAN
64168015f1
Merge "Fix flakes in tests running after testIsPrivateDnsBroken" into sc-dev
2021-06-29 06:51:25 +00:00
Paul Duffin
4c94d16ced
Merge "Enable tethering to perform its own hidden API processing" into sc-dev
2021-06-29 06:43:40 +00:00
Treehugger Robot
2dc71fe410
Merge "Fix OffloadControllerTest on R" am: 767b2180e9 am: 634ad9792d am: 897ed3fc3d
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1748154
Change-Id: I084ed1e37c2915cae0e6d7a8ca15395952cbde69
2021-06-29 05:40:36 +00:00
Treehugger Robot
897ed3fc3d
Merge "Fix OffloadControllerTest on R" am: 767b2180e9 am: 634ad9792d
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1748154
Change-Id: I2cd282bf6d7a4638cbb65f20f2ccd886ec113713
2021-06-29 05:24:11 +00:00
Treehugger Robot
634ad9792d
Merge "Fix OffloadControllerTest on R" am: 767b2180e9
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1748154
Change-Id: I5c78e3e4cb44fa88ad698bdf4cbc88f47b954e3c
2021-06-29 05:14:27 +00:00
Treehugger Robot
767b2180e9
Merge "Fix OffloadControllerTest on R"
2021-06-29 05:02:47 +00:00
Treehugger Robot
b91d44a64a
Fix flakes in tests running after testIsPrivateDnsBroken
...
The test would not reconnect wifi after restoring the private DNS setting,
so validation would not be triggered, and it would remain identified as
having broken private DNS.
Reconnect wifi after the test to avoid affecting subsequent tests.
Original-Change: https://android-review.googlesource.com/1749560
Merged-In: Id9beba94e0fed85bd26c0509ad61369be794f3c3
Change-Id: Id9beba94e0fed85bd26c0509ad61369be794f3c3
Test: atest android.net.cts.ConnectivityManagerTest
Bug: 182296835
2021-06-29 04:04:07 +00:00
Paul Duffin
b28cb44e4b
Enable tethering to perform its own hidden API processing
...
Previously, the hidden API encoding of the tethering boot dex jars,
i.e. those dex jars that tethering contributes to the bootclasspath
were done as part of the monolithic hidden API processing. This change
causes the encoding to be done by the tethering's
bootclasspath_fragment.
This change involves the following:
* Addition of the fragments property to the tethering's
bootclasspath_fragment module to list all the other
bootclasspath_fragment modules on which this depends.
* Addition of the additional_stubs property to add stubs for APIs that
are not provided by another bootclasspath_fragment.
* Moving hidden API flag file entries related to tethering from the
flag files in frameworks/base/boot/hiddenapi directory into the
tethering directory with an appropriate OWNERS file to allow them to
be managed by the Soong and compat team.
* Addition of a PREUPLOAD.cfg hook script to ensure that the flag files
are sorted.
The build automatically checks that the hidden API flags which are
computed by tethering and encoded into its boot dex jars match those
that are generated by the monolithic processing so this is guaranteed
to be safe.
Bug: 179354495
Test: m com.android.tethering
- ensure that the generated APEX is byte-for-byte identical
before and after these changes.
m out/soong/hiddenapi/hiddenapi-flags.csv
- make sure that they are not changed by this.
Change-Id: I4d9621325c7fcea5043cbca4c577ba2ac6125c0c
Ignore-AOSP-First: merge conflicts
2021-06-28 23:41:38 +01:00
Remi NGUYEN VAN
819045fc60
Partial cherry-pick to remove IoUtils#deleteContents usage in FrameworksNetTests
...
It's a partial cherry-pick of https://r.android.com/1731232
Bug: 154796679
eest: atest ConnectivityCoverageTests
Merged-In: I5366e1cc9cd6ddb41f24718246381cc2b1cc1383
Change-Id: I23565c4144e665130585a86ce66cee6c2da07b60
2021-06-28 16:53:15 +01:00
Victor Chang
909cab010e
[automerger skipped] Merge "Remove usage of internal APIs from InetAddress and ServerSocket" into sc-dev am: 99c7bdb1a4 am: e1aae8471e -s ours
...
am skip reason: Merged-In I77a419c459ee53b36d24f324ecab2b5dae5744de with SHA-1 6fae863801 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15015192
Change-Id: I6c579c3b93a3d76359e2056b4d205e4ec34768af
2021-06-28 14:46:47 +00:00
Victor Chang
9c8392d79c
[automerger skipped] Merge "Remove usage of internal APIs from InetAddress and ServerSocket" into sc-dev am: 99c7bdb1a4 -s ours am: 2f89168f6d -s ours
...
am skip reason: Merged-In I77a419c459ee53b36d24f324ecab2b5dae5744de with SHA-1 ef88fadc2e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15015192
Change-Id: I2d6da6b0acc5622277e053521d1db32a1a48458f
2021-06-28 14:37:06 +00:00
Victor Chang
e1aae8471e
Merge "Remove usage of internal APIs from InetAddress and ServerSocket" into sc-dev am: 99c7bdb1a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15015192
Change-Id: Ie62012e26e1d44b02ec58beea554e5429aca3088
2021-06-28 14:28:01 +00:00
Victor Chang
2f89168f6d
[automerger skipped] Merge "Remove usage of internal APIs from InetAddress and ServerSocket" into sc-dev am: 99c7bdb1a4 -s ours
...
am skip reason: Merged-In I77a419c459ee53b36d24f324ecab2b5dae5744de with SHA-1 ef88fadc2e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15015192
Change-Id: I100bfcaa03d6cb5715b0632ba546cc3608fced6c
2021-06-28 14:27:05 +00:00
Victor Chang
99c7bdb1a4
Merge "Remove usage of internal APIs from InetAddress and ServerSocket" into sc-dev
2021-06-28 14:17:12 +00:00
Treehugger Robot
2e90b83796
Merge "Move ConnectivityCoverageTests to general-tests" am: 9330953258 am: e206deb76e am: 917b071f80
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1749025
Change-Id: Id67b8f40baba86be438a81755485cff2f4b18f5e
2021-06-28 14:01:04 +00:00
Treehugger Robot
917b071f80
Merge "Move ConnectivityCoverageTests to general-tests" am: 9330953258 am: e206deb76e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1749025
Change-Id: I758a275ce750b0e1929dc97a059ddd5b91758c0f
2021-06-28 13:48:18 +00:00
Treehugger Robot
e206deb76e
Merge "Move ConnectivityCoverageTests to general-tests" am: 9330953258
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1749025
Change-Id: I831cf7b037ea93f09e416382bb9b27848fdd8034
2021-06-28 13:37:16 +00:00
Treehugger Robot
9330953258
Merge "Move ConnectivityCoverageTests to general-tests"
2021-06-28 13:17:25 +00:00
Victor Chang
6fae863801
Remove usage of internal APIs from InetAddress and ServerSocket
...
It affects the test only.
Bug: 154796679
Test: atest CtsNetTestCases
Merged-In: I77a419c459ee53b36d24f324ecab2b5dae5744de
Change-Id: I77a419c459ee53b36d24f324ecab2b5dae5744de
(cherry picked from commit ef88fadc2e )
2021-06-28 12:11:52 +01:00
Treehugger Robot
4e703da944
Merge "Fix flakes in tests running after testIsPrivateDnsBroken" am: de7eb04d71 am: d2b7990122 am: cb97471321
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1749560
Change-Id: Ib88f9aedaa864176c79e28e2e4557b9e1d81d44f
2021-06-28 11:01:15 +00:00
Treehugger Robot
cb97471321
Merge "Fix flakes in tests running after testIsPrivateDnsBroken" am: de7eb04d71 am: d2b7990122
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1749560
Change-Id: Id6d77c1eb1f862605ce741c894f895ad16ca4cc9
2021-06-28 10:46:56 +00:00
Treehugger Robot
d2b7990122
Merge "Fix flakes in tests running after testIsPrivateDnsBroken" am: de7eb04d71
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1749560
Change-Id: Ib7b4f8ea428c0becff28b541db84529024cddd36
2021-06-28 10:37:05 +00:00
Treehugger Robot
de7eb04d71
Merge "Fix flakes in tests running after testIsPrivateDnsBroken"
2021-06-28 10:26:24 +00:00
Treehugger Robot
b3cb552c43
Merge "Make "dumpsys tethering" print the number of registered callbacks." am: 1e50b3ea24 am: 2d4eb7e18d am: aad77e7ce4
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1749480
Change-Id: Ib4f52f94a6199cf3ac80b2ef5a1b1a7bdf34ab20
2021-06-28 10:24:27 +00:00
Treehugger Robot
aad77e7ce4
Merge "Make "dumpsys tethering" print the number of registered callbacks." am: 1e50b3ea24 am: 2d4eb7e18d
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1749480
Change-Id: Ia2351cde37d919b7dba7b609b556c08533a978ff
2021-06-28 10:15:26 +00:00
Treehugger Robot
2d4eb7e18d
Merge "Make "dumpsys tethering" print the number of registered callbacks." am: 1e50b3ea24
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1749480
Change-Id: Ib348a653fe8e66634aba2fab38949b8595624474
2021-06-28 10:07:02 +00:00
Treehugger Robot
1e50b3ea24
Merge "Make "dumpsys tethering" print the number of registered callbacks."
2021-06-28 09:50:04 +00:00
Remi NGUYEN VAN
507d094373
Move ConnectivityCoverageTests to general-tests
...
The test suite is not signed with any particular key so
can be in general-tests. This is also required for TEST_MAPPING.
Bug: 187935317
Change-Id: I9dbf98eaa28172a172e707091ea75ffdddd4971b
Test: TH for test mapping
2021-06-28 09:29:51 +00:00
Treehugger Robot
e459d59596
Merge "Remove wigig support from S tethering" am: 0b44491744 am: 8027e83cf1 am: bb8f070cb3
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1744652
Change-Id: I77489ba940b9d356e3fa053e5a4e92b4726940b3
2021-06-28 08:31:16 +00:00
Treehugger Robot
bb8f070cb3
Merge "Remove wigig support from S tethering" am: 0b44491744 am: 8027e83cf1
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1744652
Change-Id: I80b9877ef5d0bc21a2bdb31d506214d5823d5dc6
2021-06-28 08:16:56 +00:00
Treehugger Robot
8027e83cf1
Merge "Remove wigig support from S tethering" am: 0b44491744
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1744652
Change-Id: I22b34d200a016186848b59af1c7b53a47e59016e
2021-06-28 08:03:57 +00:00
Remi NGUYEN VAN
3d99032422
Merge "Fix ConnectivityManagerTest initialization on Q" am: 72f59b3019 am: 82a32e3f4a am: 9f4a31af59
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1740779
Change-Id: I2454bfd0c321edb4e1e90d671b9cb05e04d67bb2
2021-06-28 07:52:25 +00:00
Remi NGUYEN VAN
8f05a361da
Merge "Fix null PendingIntent in network listens" am: 27a942cb32 am: 78aa9a4bdc am: 8c89161b52
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1748153
Change-Id: I11eeb5b4c8d25d116dd967be0157e7603ed0a8be
2021-06-28 07:52:06 +00:00
Treehugger Robot
0b44491744
Merge "Remove wigig support from S tethering"
2021-06-28 07:51:07 +00:00
Remi NGUYEN VAN
9f4a31af59
Merge "Fix ConnectivityManagerTest initialization on Q" am: 72f59b3019 am: 82a32e3f4a
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1740779
Change-Id: I40abcac7db563480fe3c13fb5e0178d7a3629652
2021-06-28 07:40:27 +00:00
Remi NGUYEN VAN
8c89161b52
Merge "Fix null PendingIntent in network listens" am: 27a942cb32 am: 78aa9a4bdc
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1748153
Change-Id: I93002b6e1f6a40af501f8af6721865dbdc329984
2021-06-28 07:40:20 +00:00
Remi NGUYEN VAN
82a32e3f4a
Merge "Fix ConnectivityManagerTest initialization on Q" am: 72f59b3019
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1740779
Change-Id: Iea8a7bbe63a16efc10733dd94cccc77560a7a058
2021-06-28 07:28:05 +00:00
Remi NGUYEN VAN
78aa9a4bdc
Merge "Fix null PendingIntent in network listens" am: 27a942cb32
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1748153
Change-Id: I85ac14015149779efd3a2d009fffbad31881ab97
2021-06-28 07:27:47 +00:00
Remi NGUYEN VAN
72f59b3019
Merge "Fix ConnectivityManagerTest initialization on Q"
2021-06-28 07:24:49 +00:00