Remi NGUYEN VAN
fae3a439ee
[automerged blank] Rename StringNetworkSpecifier to Ethernet 2p: de9dbf5b3c
...
Blank merge reason: Change-Id I8a6d7cf41c4bbc61cee1bb5570cee5bbeb85be49 with SHA-1 e08f8cf7fc is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/13733931
Change-Id: If2e68ddc0a8b3a280df55c1dadc95920637e9f01
2021-03-02 05:12:42 +00:00
Remi NGUYEN VAN
de9dbf5b3c
Rename StringNetworkSpecifier to Ethernet
...
Tests just need a specifier to verify general NetworkSpecifier
functionality. They can use EthernetNetworkSpecifier the same way they
use StringNetworkSpecifier.
To keep the tests passing on Q and R, add a CompatUtil class that will
keep creating StringNetworkSpecifiers (now removed) instead.
Bug: 179329291
Test: atest CtsNetTestCases
(note the merged-in clause is an unrelated change, used to avoid the
branch)
Merged-In: I8a6d7cf41c4bbc61cee1bb5570cee5bbeb85be49
Change-Id: Ic6bf611ba36b555e4e0bb1bd3fa0053fe29dc8cf
2021-03-02 05:12:30 +00:00
TreeHugger Robot
dacd68bdc5
[automerger skipped] Merge "DO NOT MERGE: re-enable ConnectivityManagerTest in mainline-prod." into mainline-prod am: 2d2be033e2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/13725032
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5d33590de4671d23c1168da09bbee5f954d82644
2021-03-02 00:55:13 +00:00
TreeHugger Robot
2d2be033e2
Merge "DO NOT MERGE: re-enable ConnectivityManagerTest in mainline-prod." into mainline-prod
2021-03-02 00:22:34 +00:00
Treehugger Robot
72fdc45f46
Merge "Make ConnectivityManagerTest use the API shims." am: c8761c98ae am: c7d509804b am: 68b7e0e0a4
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1611323
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5ad4b4e82e81e08230af606068affeb96ae02d8c
2021-03-01 21:12:01 +00:00
Treehugger Robot
750a7dd0d9
Merge "Make ConnectivityManagerTest use the API shims." am: c8761c98ae am: c7d509804b am: d5821f3c06
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1611323
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I871cb81b88ec2c02d838a6f0ea33f842a1aa15f6
2021-03-01 20:48:44 +00:00
Treehugger Robot
d5821f3c06
Merge "Make ConnectivityManagerTest use the API shims." am: c8761c98ae am: c7d509804b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1611323
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1b49229f76a378336c55d658e2e186973fe88a58
2021-03-01 20:09:03 +00:00
Treehugger Robot
68b7e0e0a4
Merge "Make ConnectivityManagerTest use the API shims." am: c8761c98ae am: c7d509804b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1611323
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib784ca6a840f4a89bb28f4930544ff9c6f37b82e
2021-03-01 20:06:09 +00:00
Treehugger Robot
c7d509804b
Merge "Make ConnectivityManagerTest use the API shims." am: c8761c98ae
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1611323
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie3de6a218eabeab2532d6ee4d27c7f2ee65b6065
2021-03-01 19:30:24 +00:00
Sudheer Shanka
4041472853
Merge "Wait for the finish-component broadcasts to be handled." into sc-dev
2021-03-01 18:32:41 +00:00
Treehugger Robot
c8761c98ae
Merge "Make ConnectivityManagerTest use the API shims."
2021-03-01 17:50:10 +00:00
Remi NGUYEN VAN
43fed99b1d
Add CtsNetTestCases to TEST_MAPPING am: ad380c1de6 am: 94358c4c9e am: fa0aea21e2
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1612014
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ieeb84e2d6855d18448e34fbdb6bea58412158647
2021-03-01 10:56:56 +00:00
Remi NGUYEN VAN
a8052f90ce
Add CtsNetTestCases to TEST_MAPPING am: ad380c1de6 am: 94358c4c9e am: 074f40bd54
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1612014
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib787ad220d4ebff2ce1d8ccacf029e1fa76d9d31
2021-03-01 10:39:29 +00:00
Remi NGUYEN VAN
074f40bd54
Add CtsNetTestCases to TEST_MAPPING am: ad380c1de6 am: 94358c4c9e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1612014
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I30f6e15c961f9cafa5e223d1d6f0ed3e6118d3cf
2021-03-01 09:41:50 +00:00
Remi NGUYEN VAN
fa0aea21e2
Add CtsNetTestCases to TEST_MAPPING am: ad380c1de6 am: 94358c4c9e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1612014
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4588f5e7e4444a34bc152b9ce71f1a8645548368
2021-03-01 09:41:48 +00:00
Remi NGUYEN VAN
94358c4c9e
Add CtsNetTestCases to TEST_MAPPING am: ad380c1de6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1612014
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I35c8e85d9c321a96703e879ff2ce230749d7f9dd
2021-03-01 09:02:25 +00:00
Remi NGUYEN VAN
7dd4182366
[automerger skipped] Merge "Add dependency on system API in connectivity" am: bc1bdf4a85 am: 68b759c2c1 am: 86301b1ae1 -s ours
...
am skip reason: Change-Id Iebfb3e01c5d2480e84edcfc76cf489520bd60237 with SHA-1 cfe676379a is in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1552320
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I39bf52549f579c6dc040930a43b9d9b05e2d78a3
2021-03-01 08:50:52 +00:00
TreeHugger Robot
897e686b52
[automerger skipped] Merge "Disable CtsNetTestCases in mainline-prod." into mainline-prod am: 87f6c8f756 -s ours
...
am skip reason: Change-Id Ib0ac49609e444a53a6fee4575f5078e15f364eef with SHA-1 2812f607a0 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/13725029
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1dfcf50d00b9afdae5a119d046e9452219fa8600
2021-03-01 08:14:02 +00:00
Lorenzo Colitti
79d2ee0317
DO NOT MERGE: re-enable ConnectivityManagerTest in mainline-prod.
...
Bug: 167645754
Ignore-AOSP-First: test is already enabled in AOSP
Test: atest CtsNetTestCasesLatestSdk passes on R device
Change-Id: I9677518a6a43bf3195e42ba21291a84846e31f14
2021-03-01 16:44:58 +09:00
Lorenzo Colitti
8060dfed23
Make ConnectivityManagerTest use the API shims.
...
This is required for the code to be identical in AOSP and
mainline-prod.
Bug: 167645754
Test: atest CtsNetTestCases passes on AOSP device
Test: atest CtsNetTestCasesLatestSdk passes on AOSP device
Test: atest CtsNetTestCasesLatestSdk passes on R device
Change-Id: I094906e535d710a46a3fa833b6aa48cb007d6b63
2021-03-01 15:59:40 +09:00
Remi NGUYEN VAN
ad380c1de6
Add CtsNetTestCases to TEST_MAPPING
...
CtsNetTestCases is identical to CtsNetTestCasesLatestSdk,
with a newer target_sdk and newer API shims.
Bug: 167645754
Change-Id: Ib4e281bf84cb6ba0e7b904d57cef7c985dec2132
Test: atest CtsNetTestCases
2021-03-01 06:54:57 +00:00
TreeHugger Robot
87f6c8f756
Merge "Disable CtsNetTestCases in mainline-prod." into mainline-prod
2021-03-01 06:29:46 +00:00
Lorenzo Colitti
b34ed63a36
Disable CtsNetTestCases in mainline-prod.
...
This currently still builds, but it will stop building as soon
as we make it depend on the networkstack current shims. It should
not be used for anything in mainline-prod anyway, everything uses
CtsNetTestCasesLatestSdk.
The Merged-In clause is from unrelated change aosp/1542627 and is
intended to ensure this change does not propagate to any
downstream branches.
Bug: 167645754
Test: mmm packages/modules/Connectivity
Change-Id: Ib47b181902e8e634f419e5544472859760c2ce77
Merged-In: Ib0ac49609e444a53a6fee4575f5078e15f364eef
2021-03-01 14:02:41 +09:00
Sudheer Shanka
9326a98dd9
Wait for the finish-component broadcasts to be handled.
...
Bug: 180533352
Test: atest ./tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Ignore-AOSP-First: Expedited jobs are not available in AOSP
Change-Id: I564c15c2fd6caba61029f2b282e7a3c3afeca120
2021-02-28 19:01:31 -08:00
Lorenzo Colitti
e4391fb4b4
[automerger skipped] Use NET_CAPABILITY_NOT_VCN_MANAGED from ConstantsShim. am: 589d0ad195 am: 894c6ff74a am: c715bf96b9 -s ours
...
am skip reason: Change-Id If40ebfadbf6d3ee86a58a55711fbc146a8599fdb with SHA-1 7246474dfd is in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1611315
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2f15c603768471826d332df6bbdbea6c11f6c9cf
2021-03-01 02:47:28 +00:00
Remi NGUYEN VAN
f461e9fa41
[automerger skipped] Merge "Add dependency on system API in connectivity" am: bc1bdf4a85 am: 68b759c2c1 -s ours am: 378cdb79ae -s ours
...
am skip reason: Change-Id Iebfb3e01c5d2480e84edcfc76cf489520bd60237 with SHA-1 cfe676379a is in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1552320
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia53551812efd456255f58cb4d541a839e6b2e1f7
2021-03-01 02:46:32 +00:00
Lorenzo Colitti
882db950a6
[automerger skipped] Use NET_CAPABILITY_NOT_VCN_MANAGED from ConstantsShim. am: 589d0ad195 am: 894c6ff74a -s ours am: f5716d15a1 -s ours
...
am skip reason: Change-Id If40ebfadbf6d3ee86a58a55711fbc146a8599fdb with SHA-1 7246474dfd is in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1611315
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3fd493a8a6d65c637616550b3c9465916cf3be47
2021-03-01 02:46:25 +00:00
Remi NGUYEN VAN
86301b1ae1
Merge "Add dependency on system API in connectivity" am: bc1bdf4a85 am: 68b759c2c1
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1552320
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I98afe8d83f2a111b0a0bc3bc1081fb35ea31a328
2021-03-01 02:25:13 +00:00
Remi NGUYEN VAN
378cdb79ae
[automerger skipped] Merge "Add dependency on system API in connectivity" am: bc1bdf4a85 am: 68b759c2c1 -s ours
...
am skip reason: Change-Id Ic2491f04880ff66abc3b2d3aaee6168e18f6d68a with SHA-1 50caf56267 is in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1552320
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8a4f14be93111a9907319fc38c053ca4b4b4384b
2021-03-01 02:24:41 +00:00
Remi NGUYEN VAN
68b759c2c1
Merge "Add dependency on system API in connectivity" am: bc1bdf4a85
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1552320
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib1db46318bbccfc496f5fcc9481e177d66e9b46a
2021-03-01 02:10:04 +00:00
Lorenzo Colitti
c715bf96b9
Use NET_CAPABILITY_NOT_VCN_MANAGED from ConstantsShim. am: 589d0ad195 am: 894c6ff74a
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1611315
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I524c692df857f07d17d038271597137fcb38d705
2021-03-01 02:04:29 +00:00
Lorenzo Colitti
f5716d15a1
[automerger skipped] Use NET_CAPABILITY_NOT_VCN_MANAGED from ConstantsShim. am: 589d0ad195 am: 894c6ff74a -s ours
...
am skip reason: Change-Id If40ebfadbf6d3ee86a58a55711fbc146a8599fdb with SHA-1 7246474dfd is in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1611315
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I750f9eb205bce8bacae0b2406fcd0ce424e75516
2021-03-01 02:04:26 +00:00
Remi NGUYEN VAN
bc1bdf4a85
Merge "Add dependency on system API in connectivity"
2021-03-01 01:07:19 +00:00
Lorenzo Colitti
894c6ff74a
Use NET_CAPABILITY_NOT_VCN_MANAGED from ConstantsShim. am: 589d0ad195
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1611315
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0b6636bd7b8a6419341bcf1e0c65a62dea27e0b0
2021-03-01 00:46:54 +00:00
Lorenzo Colitti
589d0ad195
Use NET_CAPABILITY_NOT_VCN_MANAGED from ConstantsShim.
...
This is required to build in mainline-prod, which does not have
access to in-progress S APIs.
Bug: 167645754
Test: m NetworkStack CtsNetTestCasesLatestSdk CtsHostsideNetworkTests CtsHostsideNetworkTestsApp
Change-Id: If40ebfadbf6d3ee86a58a55711fbc146a8599fdb
Merged-In: If40ebfadbf6d3ee86a58a55711fbc146a8599fdb
2021-03-01 00:16:36 +09:00
Junyu Lai
e08f8cf7fc
Merge "Fix CTS test failed on R device" am: 75d28bee27 am: 3ec8882370 am: 239c23c9dc
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1602480
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8a6d7cf41c4bbc61cee1bb5570cee5bbeb85be49
2021-02-26 17:31:47 +00:00
Remi NGUYEN VAN
209a87d591
Merge "Add flag to force choosing upstreams automatically" am: e43c960d50 am: a474b9edfa am: af4b10e326
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1596352
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I071f90039668ea2e6d665b0ab432bab228c36696
2021-02-26 17:31:15 +00:00
Treehugger Robot
9d80e9cda5
Merge "ebpf offload: bump size of ipv4 tethering maps" am: fcd5ec1971 am: f1a420808c am: c6551d73b7
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1608893
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I19750e73d9a67db892a06a47a0bfeb8c6c4d20c8
2021-02-26 17:30:38 +00:00
Treehugger Robot
fd8d2a38ea
Merge "ebpf offload: mark as critical for tethering not netd" am: 4945772ba7 am: 9ea87036a8 am: ff55bbf0f4
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1607252
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8247e3231c81138becbd8acc80ff9647b0443c32
2021-02-26 17:29:12 +00:00
Junyu Lai
5881216ccd
Merge "[VCN07.1] Add test for bypassing VCN for non-internet request" am: 3f134a3805 am: b209d3a2a7 am: 5e92915fa0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1597477
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ice9cf7bfdfe80abf62c8516136895b9d5dd258b1
2021-02-26 17:25:16 +00:00
Lorenzo Colitti
0950f0e83a
[automerger skipped] Use NET_CAPABILITY_NOT_VCN_MANAGED from ConstantsShim. am: 7246474dfd -s ours
...
am skip reason: Change-Id I5cd32efd0f87c823cd2d0a2fa3a95a83093fb6f9 with SHA-1 ffb0ccd04b is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/13709245
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If1592305569a5112ec2719fbc376d1ea9b69a85f
2021-02-26 15:54:10 +00:00
Lorenzo Colitti
7246474dfd
Use NET_CAPABILITY_NOT_VCN_MANAGED from ConstantsShim.
...
This is required to build in mainline-prod, which does not have
access to in-progress S APIs.
The Merged-In tag in this CL is from aosp/1604974, which is an
arbitrary CL that is already in sc-dev, with the purpose of
preventing this CL from reaching sc-dev.
Bug: 167645754
Ignore-AOSP-First: need to fix build
Test: m NetworkStack CtsNetTestCasesLatestSdk CtsHostsideNetworkTests CtsHostsideNetworkTestsApp
Change-Id: If40ebfadbf6d3ee86a58a55711fbc146a8599fdb
Merged-In: I5cd32efd0f87c823cd2d0a2fa3a95a83093fb6f9
2021-02-26 13:48:00 +00:00
Junyu Lai
7b0fc6f309
Merge "Fix CTS test failed on R device" am: 75d28bee27 am: 3ec8882370 am: 0937250278
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1602480
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie091b95fd2dc27f2cd03aa45e316fc5f8af0188b
2021-02-26 11:13:44 +00:00
Remi NGUYEN VAN
cede7f6032
Merge "Add flag to force choosing upstreams automatically" am: e43c960d50 am: a474b9edfa am: 62a1ba2d1b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1596352
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id88654e5344f3be87885d4214189d5c90f66ae6d
2021-02-26 11:13:39 +00:00
Treehugger Robot
7eab6c5c9f
Merge "ebpf offload: bump size of ipv4 tethering maps" am: fcd5ec1971 am: f1a420808c am: f14f0783aa
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1608893
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icabf533dee7e6f9d57e23f4e4e58d40e8a714aa5
2021-02-26 11:13:33 +00:00
Treehugger Robot
bf45229ed9
Merge "ebpf offload: mark as critical for tethering not netd" am: 4945772ba7 am: 9ea87036a8 am: 0057b06d90
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1607252
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7cf9212f5d8e0c35303406876ff7e772725dd7c0
2021-02-26 11:13:17 +00:00
Junyu Lai
31d4b0a112
Merge "[VCN07.1] Add test for bypassing VCN for non-internet request" am: 3f134a3805 am: b209d3a2a7 am: da1951ace8
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1597477
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icfb07b84b3a6d708241eec5629c8fccc79b712b1
2021-02-26 11:12:21 +00:00
Remi NGUYEN VAN
74b274424a
Add dependency on system API in connectivity
...
The system API are moved to the connectivity module: add dependency on
the stubs from framework-tethering.
This only allows tethering to depend on system API defined by the
connectivity classes, not on any private code, even if they are
eventually bundled in the same APEX.
Bug: 171540887
Test: m
Merged-In: Iebfb3e01c5d2480e84edcfc76cf489520bd60237
Merged-In: Ic2491f04880ff66abc3b2d3aaee6168e18f6d68a
(clean cherry-pick from internal branch)
Change-Id: Iebfb3e01c5d2480e84edcfc76cf489520bd60237
2021-02-26 19:36:06 +09:00
Junyu Lai
239c23c9dc
Merge "Fix CTS test failed on R device" am: 75d28bee27 am: 3ec8882370
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1602480
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I856c51aa30da6d9e5097aee2a65fb99f8c6fb8aa
2021-02-26 10:07:11 +00:00
Chalard Jean
dd01e4d688
Merge "Release test network in a test" am: 26c11595bc am: d3e8ae1f88 am: 41870192e3
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1605235
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I92f3749b7e6de72fa256d1389627602523bf1a0c
2021-02-26 10:04:24 +00:00