Commit Graph

12246 Commits

Author SHA1 Message Date
Junyu Lai
cdfe0911c1 Merge "Add CTS for getAllNetworkStateSnapshots" into sc-dev am: 9a4c06f276
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14598438

Change-Id: Ica5635e919edc09bcd208226a0551749dd369ef5
2021-05-21 09:51:22 +00:00
Junyu Lai
9a4c06f276 Merge "Add CTS for getAllNetworkStateSnapshots" into sc-dev 2021-05-21 09:36:49 +00:00
Chiachang Wang
158fae71b4 Merge "Unify the verification for unregister a NetworkAgent" am: 14e14a36ea am: 65fd62fc63
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1664603

Change-Id: I8559fb107b6b70a34dc3d088e212fe85546af433
2021-05-21 08:20:57 +00:00
Chiachang Wang
65fd62fc63 Merge "Unify the verification for unregister a NetworkAgent" am: 14e14a36ea
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1664603

Change-Id: I56c9f3a74097256190f442e54f0227c495ff9006
2021-05-21 08:05:13 +00:00
Chiachang Wang
14e14a36ea Merge "Unify the verification for unregister a NetworkAgent" 2021-05-21 07:47:58 +00:00
junyulai
3a64e80dee Add CTS for getAllNetworkStateSnapshots
Ignore-AOSP-First: Needs cherry-picks
Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest#testGetAllNetworkStateSnapshots --rerun-until-failure 100
Test: atest
CtsNetTestCasesLatestSdk:android.net.cts.ConnectivityManagerTest on R
device
Bug: 188140631

Change-Id: I573b009bd05bbc0c855aaa6e20cb8ebde6729936
2021-05-21 06:43:31 +00:00
TreeHugger Robot
310be1f034 Merge "Add CTS for NetworkAgentConfig#setSubscriberId" into sc-dev am: 323a05334b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14639705

Change-Id: If01d91221d48ab6b12c688ee234fded218480b40
2021-05-21 04:13:04 +00:00
TreeHugger Robot
323a05334b Merge "Add CTS for NetworkAgentConfig#setSubscriberId" into sc-dev 2021-05-21 03:50:11 +00:00
Junyu Lai
21c9a28ba0 Merge "Fix TetheringTest crash on eng build" am: ff77e99cf0 am: 2d5584fc34
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1711433

Change-Id: I76bacf4edde90cb658fa74ccd8079a2ba68b9f91
2021-05-21 03:08:37 +00:00
Junyu Lai
2d5584fc34 Merge "Fix TetheringTest crash on eng build" am: ff77e99cf0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1711433

Change-Id: Ie7f1f8c1098cd839cb490e028b788e14f778677a
2021-05-21 02:52:49 +00:00
Junyu Lai
ff77e99cf0 Merge "Fix TetheringTest crash on eng build" 2021-05-21 02:40:13 +00:00
Treehugger Robot
bea976d24f [automerger skipped] Merge "Add bootclasspath_fragment." am: d9de9d783b am: be47f3b7d1 -s ours
am skip reason: Merged-In Ia19ed0d5e13676882239dd5a1456c97549119994 with SHA-1 8bb425a75e is already in history

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

Change-Id: I9c4ba13c39c7e36bbf933ad24e792a9a47cab524
2021-05-20 10:09:14 +00:00
Treehugger Robot
be47f3b7d1 Merge "Add bootclasspath_fragment." am: d9de9d783b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1705545

Change-Id: I88a6bed52cf6ca7ebd3419742af7524e935e635d
2021-05-20 09:53:17 +00:00
Treehugger Robot
10b5b3f2fb Merge "Update connectivity TEST_MAPPING" am: 7960575fab am: 218ac93535
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1713468

Change-Id: I30d412d457aac60ddf6bba21c75745bcc66f0714
2021-05-20 09:38:54 +00:00
Treehugger Robot
d9de9d783b Merge "Add bootclasspath_fragment." 2021-05-20 09:37:05 +00:00
markchien
27f8159058 [automerger skipped] Fix tethering unit test fail in R am: 6cee9c5e04 am: 2aa768a7e9 -s ours
am skip reason: Merged-In I4eb4b757f6d7cd3458964c81310dcf0687a4f091 with SHA-1 9eac605333 is already in history

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

Change-Id: I44aaa182d4db5bbbcbd29f2661bb2f896fef872c
2021-05-20 09:37:03 +00:00
markchien
2aa768a7e9 Fix tethering unit test fail in R am: 6cee9c5e04
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14660570

Change-Id: I357e2e93204fb67119e7ec81bcf9020b73912d88
2021-05-20 09:17:20 +00:00
Treehugger Robot
218ac93535 Merge "Update connectivity TEST_MAPPING" am: 7960575fab
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1713468

Change-Id: Ibdbf3af0e113523339e09eceaef24e951a617093
2021-05-20 09:16:46 +00:00
Treehugger Robot
7960575fab Merge "Update connectivity TEST_MAPPING" 2021-05-20 08:49:46 +00:00
markchien
6cee9c5e04 Fix tethering unit test fail in R
The change aosp/1708088 break tethering unit test in R.

Bug: 187946226
Test: atest TetheringTests in R and S
Change-Id: I4eb4b757f6d7cd3458964c81310dcf0687a4f091
Merged-In: I4eb4b757f6d7cd3458964c81310dcf0687a4f091
2021-05-20 14:52:01 +08:00
markchien
52998bed1d Fix tethering unit test fail in R am: 9eac605333 am: b582c81ee8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1711436

Change-Id: Ie6c845f8169df062db77bdd0f80f591d7fb44a1b
2021-05-20 06:10:55 +00:00
Junyu Lai
056b6649cd Add CTS for NetworkAgentConfig#setSubscriberId
Ignore-AOSP-First: Needs cherry-picks
Test: atest CtsNetTestCases:android.net.cts.NetworkAgentTest
Test: atest CtsNetTestCasesLatestSdk:android.net.cts.NetworkAgentTest
      on R device
Bug: 188140631
Change-Id: I90d47ac9bd0570c0aed19402fa9be4e99e0f8621
2021-05-20 06:07:08 +00:00
markchien
b582c81ee8 Fix tethering unit test fail in R am: 9eac605333
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1711436

Change-Id: I4a6c05d5b12ef159367e70df661fa2d386124fa9
2021-05-20 05:54:03 +00:00
Remi NGUYEN VAN
d954bfcd32 Update connectivity TEST_MAPPING
- Move Tethering TEST_MAPPING up one level to merge with the general
   Connectivity TEST_MAPPING. This allows running the tethering tests
   on any connectivity change.
 - Move TetheringIntegrationTests from postsubmit to presubmit
 - Add TetheringCoverageTests to mainline-postsubmit, so it can be
   added to mainline-presubmit later.
 - Import NetworkStack tests so that they are run on any connectivity
   change.

TetheringIntegrationTests were continuously green in postsubmit.

Bug: 187946226
Change-Id: Ibf05ad64b02c563930ba0f01eb91331b295fe505
Test: Treehugger needed to test TEST_MAPPING files
2021-05-20 01:26:51 +00:00
markchien
9eac605333 Fix tethering unit test fail in R
The change aosp/1708088 break tethering unit test in R.

Bug: 187946226
Test: atest TetheringTests in R and S
Change-Id: I4eb4b757f6d7cd3458964c81310dcf0687a4f091
2021-05-19 22:58:36 +08:00
junyulai
7ba566dbf7 Fix TetheringTest crash on eng build
startTrackDefaultNetwork was allowed to called multiple times
before even though there is no one actually do it. However,
in the TetheringTest#verifyDefaultNetworkRequestFiled, a
manual invocation is used to ensure that function supports
multiple entrance.

But with aosp/1697371, startTrackDefaultNetwork is no longer
allowed to be called multiple times, it would lead to log.wtf
and crash system in eng build.

Since the manual invocation of startTrackDefaultNetwork is not
realistic and no longer valid anymore, remove the invocation
that caused the trouble.

Test: atest TetheringCoverageTests
Bug: 188613493
Change-Id: I61f6088783d521fd17ae1e87370842b4239fbe75
2021-05-19 16:23:13 +08:00
Mark Chien
fa9ab59116 Merge "Add the tethering type to TetheringEventCallback methods" into sc-dev am: 53fcccd8da
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14608082

Change-Id: Id17995f5684aadb83a9061f99d4f7191090022b2
2021-05-18 15:03:04 +00:00
Mark Chien
53fcccd8da Merge "Add the tethering type to TetheringEventCallback methods" into sc-dev 2021-05-18 14:48:27 +00:00
markchien
9935dbe03e Add the tethering type to TetheringEventCallback methods
Before this change, tethering always report a list of tethered
interfaces and the caller need to use each tethering type's interface
regex to matching tethered list to manual implement the mapping of
tethering type and interface. This change allow caller to get rid of
tethering interface regex.

Bug: 162920185
Bug: 152203943
Test: atest CtsTetheringTest on S
Ignore-AOSP-First: Currently aosp would automerge to mainlne-prod, merge
to sc-dev first to avoid adding new API to mainline-prod

CTS-Coverage-Bug: I already add cts test(ag/14622456), but Lint
still complaint because my cts is under packages/modules/Connectivity/
but it only check whether CL touching platform/cts
Change-Id: I91bcccd676d109c1b974497ac29bd366a41b8899
2021-05-18 14:47:43 +00:00
Artur Satayev
529262a95c Merge "Add bootclasspath_fragment." into sc-dev am: f8a1897b29
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14516938

Change-Id: Id5ef56a4fa81942079af6342ff009588ec1e9bbd
2021-05-18 14:24:57 +00:00
Artur Satayev
f8a1897b29 Merge "Add bootclasspath_fragment." into sc-dev 2021-05-18 14:06:03 +00:00
TreeHugger Robot
655b91c722 Merge "Check whether feature is enabled by compare with apex version" into mainline-prod am: 2b5ca309f9 am: 255730e200
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14608089

Change-Id: Id8ef321cd7d7f13e79c10e77dfa9cea5c3e6cddd
2021-05-18 13:42:36 +00:00
TreeHugger Robot
255730e200 Merge "Check whether feature is enabled by compare with apex version" into mainline-prod am: 2b5ca309f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14608089

Change-Id: If82b0f147e3f26813746e7f3c4df11f605bf4a94
2021-05-18 13:26:42 +00:00
TreeHugger Robot
2b5ca309f9 Merge "Check whether feature is enabled by compare with apex version" into mainline-prod 2021-05-18 12:56:16 +00:00
Treehugger Robot
5f92df3f89 Merge "[VCN21.1] Verify capability is not added if specifier is present" am: 20d9f4722e am: 82e910ecc5 am: 68f8081aae am: c831d5a60b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1705134

Change-Id: Ifef5891d703068dc97962575fc81f64b10c2fd71
2021-05-18 10:36:17 +00:00
Mark Chien
1377ae64b6 Merge "Check whether feature is enabled by compare with apex version" am: 84a8a13a92 am: c59d6fa12d am: 2d577ad3d2 am: e66481b436
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1708088

Change-Id: Ib0430e26d27fd59ef29d4ee44557d2e1163160a1
2021-05-18 10:36:05 +00:00
Treehugger Robot
c831d5a60b Merge "[VCN21.1] Verify capability is not added if specifier is present" am: 20d9f4722e am: 82e910ecc5 am: 68f8081aae
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1705134

Change-Id: Iba23024382a3b9ab8d8f0946eb902c6c3dd19975
2021-05-18 10:16:58 +00:00
Mark Chien
e66481b436 Merge "Check whether feature is enabled by compare with apex version" am: 84a8a13a92 am: c59d6fa12d am: 2d577ad3d2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1708088

Change-Id: Ifcc571196e302245816b663155bc57aabdef542b
2021-05-18 10:16:47 +00:00
Treehugger Robot
5280262322 Merge "[VCN21.1] Verify capability is not added if specifier is present" am: 20d9f4722e am: 82e910ecc5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1705134

Change-Id: I14eae298090e963dab835be59c92a5f68e193a7f
2021-05-18 09:57:20 +00:00
Mark Chien
92082dad6e Merge "Check whether feature is enabled by compare with apex version" am: 84a8a13a92 am: c59d6fa12d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1708088

Change-Id: I3de35429df8000efa832f0328b5638d0e3fcff7f
2021-05-18 09:56:41 +00:00
Treehugger Robot
68f8081aae Merge "[VCN21.1] Verify capability is not added if specifier is present" am: 20d9f4722e am: 82e910ecc5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1705134

Change-Id: Iefa25664714ee187be4ddc4359afcd0968ab4ecf
2021-05-18 09:56:05 +00:00
Mark Chien
2d577ad3d2 Merge "Check whether feature is enabled by compare with apex version" am: 84a8a13a92 am: c59d6fa12d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1708088

Change-Id: Id993424e895917267ac5ffa43ab3362169c1d37c
2021-05-18 09:56:00 +00:00
Mark Chien
b0fcd5f0c5 Check whether feature is enabled by compare with apex version
Replace the isFeatureEnabled function which is check with apex version.

Bug: 187946226
Test: Set device config flag and check the result

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

Ignore-AOSP-First: manual cherry-pick from AOSP build automerge is broken
Change-Id: Iefbd6fa6a061614b83d115219f8939dee8794bb7
2021-05-18 09:44:43 +00:00
Treehugger Robot
82e910ecc5 Merge "[VCN21.1] Verify capability is not added if specifier is present" am: 20d9f4722e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1705134

Change-Id: Iae49fd663e9b90e935b9065ef60561f2b4c55439
2021-05-18 09:36:16 +00:00
Treehugger Robot
20d9f4722e Merge "[VCN21.1] Verify capability is not added if specifier is present" 2021-05-18 08:35:06 +00:00
Lorenzo Colitti
598fd1e3dd Merge "Add a CTS tests for setIncludeOtherUidNetworks." into sc-dev am: 02de682901
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14598440

Change-Id: I9c38abc5dce8127b66f3cf4e960f577e89284676
2021-05-18 07:12:50 +00:00
Lorenzo Colitti
02de682901 Merge "Add a CTS tests for setIncludeOtherUidNetworks." into sc-dev 2021-05-18 06:47:43 +00:00
Lorenzo Colitti
ad9c644b6b Add a CTS tests for setIncludeOtherUidNetworks.
Bug: 187921303
Test: test-only change
Ignore-AOSP-First: avoid merge conflicts
Change-Id: I8e259041dad3fb9c38202cbb12b344de15f4101f
2021-05-18 04:43:20 +00:00
Mark Chien
c59d6fa12d Merge "Check whether feature is enabled by compare with apex version" am: 84a8a13a92
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1708088

Change-Id: Iefbd6fa6a061614b83d115219f8939dee8794bb7
2021-05-18 03:37:13 +00:00
Mark Chien
84a8a13a92 Merge "Check whether feature is enabled by compare with apex version" 2021-05-18 03:09:20 +00:00