Commit Graph

43700 Commits

Author SHA1 Message Date
Junyu Lai
3b29071c8b [automerger skipped] No-op refactoring of NetworkAgentTest am: e5bdc06735 am: 1fefd7f674 -s ours
am skip reason: Merged-In Id7948d218b78ae0abf253ca8925e787362ac463f with SHA-1 32634e9da3 is already in history

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

Change-Id: I7ef8f4b3914af24f0638c20439586deb7969d45b
2021-06-17 10:51:42 +00:00
Automerger Merge Worker
fe7fc9001c Merge "[automerger skipped] Add CTS test for NetworkAgent/NetworkAgentConfig API am: 42096be0c6 -s ours am: 231c832781 -s ours" into sc-v2-dev-plus-aosp 2021-06-17 10:51:36 +00:00
lifr
40ff954a29 [automerger skipped] Add CTS test for NetworkAgent/NetworkAgentConfig API am: 42096be0c6 -s ours am: 231c832781 -s ours
am skip reason: Merged-In Ia67b963b8e18af8440b1b9bd91f53439848bb838 with SHA-1 561547a537 is already in history

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

Change-Id: I0e2e7ccfa2da3394ddc3140dc2790cb10a3770d1
2021-06-17 10:51:33 +00:00
lifr
be207443db [automerger skipped] Add CTS test for NetworkAgent/NetworkAgentConfig API am: 42096be0c6 am: 396c9afb65 -s ours
am skip reason: Merged-In Ia67b963b8e18af8440b1b9bd91f53439848bb838 with SHA-1 561547a537 is already in history

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

Change-Id: I053df5078bfe543d41d21b1c2cc93a218ad9a622
2021-06-17 10:51:29 +00:00
Junyu Lai
1fefd7f674 No-op refactoring of NetworkAgentTest am: e5bdc06735
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14662648

Change-Id: Id039d9285e4c7aefd59a75be68ff5a2f039e260c
2021-06-17 10:40:05 +00:00
lifr
396c9afb65 Add CTS test for NetworkAgent/NetworkAgentConfig API am: 42096be0c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15009311

Change-Id: I15d0567cae9f26c276377a60c73732d91264f818
2021-06-17 10:39:43 +00:00
lifr
231c832781 [automerger skipped] Add CTS test for NetworkAgent/NetworkAgentConfig API am: 42096be0c6 -s ours
am skip reason: Merged-In Ia67b963b8e18af8440b1b9bd91f53439848bb838 with SHA-1 561547a537 is already in history

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

Change-Id: I91acbe710c9ed4869dae08a31f38722d2766655e
2021-06-17 10:38:51 +00:00
Junyu Lai
e5bdc06735 No-op refactoring of NetworkAgentTest
This is a no-op refactoring of NetworkAgentTest, which makes
the create*NetworkAgent helper functions easier to use, this
includes:
  1. Rename "name" field to specifier, since it is the only
     purpose of that field.
  2. Make the callback generated with agent dedicated to the
     agent by adding specifier to support multiple agent cases.
  3. Refactor some code flow to for readability and less
     duplicated code.

Test: atest CtsNetTestCases:android.net.cts.NetworkAgentTest \
      --rerun-until-failure 100
Test: atest CtsNetTestCasesLatestSdk:android.net.cts.NetworkAgentTest
      on R device
Bug: 188657173
Merged-In: Id7948d218b78ae0abf253ca8925e787362ac463f
Change-Id: Id7948d218b78ae0abf253ca8925e787362ac463f
  (cherry-picked from aosp/1727823)
2021-06-17 09:01:09 +00:00
lifr
42096be0c6 Add CTS test for NetworkAgent/NetworkAgentConfig API
The following is a list of APIs:
1. NetworkAgent.setLegacySubtype
2. NetworkAgentConfig.Builder.setLegacySubType
3. NetworkAgentConfig.Builder.setLegacySubTypeName
4. NetworkAgentConfig.Builder.setLegacyExtraInfo

Bug: 190413710
Test: atest android.net.cts.NetworkAgentTest
      atest CtsNetTestCasesLatestSdk:NetworkAgentTest
Merged-In: Ia67b963b8e18af8440b1b9bd91f53439848bb838
Change-Id: Ia67b963b8e18af8440b1b9bd91f53439848bb838
  (cherry-picked from aosp/1693668)
2021-06-17 09:00:30 +00:00
Chiachang Wang
c9ab9cbff1 Merge "Add test for CM#setAcceptUnvalidated" am: 27586f8210 am: d6d3bf0b89 am: 4da66b9d58
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1731234

Change-Id: I4cc9039afe6a397645f072593eaa4a0da765ee2f
2021-06-16 15:55:16 +00:00
Chiachang Wang
5f2474577e Merge "Add test for CM#setAcceptPartialConnectivity" am: 2693dc2696 am: 98e8422124 am: ef5a495829
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1730545

Change-Id: I54f1ca91df0dc6898af74d84fba681d93f10bf0a
2021-06-16 15:55:07 +00:00
Chiachang Wang
4da66b9d58 Merge "Add test for CM#setAcceptUnvalidated" am: 27586f8210 am: d6d3bf0b89
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1731234

Change-Id: If39fb3d39aee18dab8476fdac934724685c46817
2021-06-16 15:39:15 +00:00
Chiachang Wang
ef5a495829 Merge "Add test for CM#setAcceptPartialConnectivity" am: 2693dc2696 am: 98e8422124
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1730545

Change-Id: Ie49fb789e8731ddac1465fed46f5f139d8ce10f6
2021-06-16 15:39:08 +00:00
Chiachang Wang
d6d3bf0b89 Merge "Add test for CM#setAcceptUnvalidated" am: 27586f8210
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1731234

Change-Id: I524644366a398b34de8f659d0d0d275f3f513c0c
2021-06-16 15:29:47 +00:00
Chiachang Wang
98e8422124 Merge "Add test for CM#setAcceptPartialConnectivity" am: 2693dc2696
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1730545

Change-Id: I702a17935b7e0a29d5c45e5ae6bd7ccf3c76eccd
2021-06-16 15:29:37 +00:00
Chiachang Wang
27586f8210 Merge "Add test for CM#setAcceptUnvalidated" 2021-06-16 15:17:51 +00:00
Chiachang Wang
2693dc2696 Merge "Add test for CM#setAcceptPartialConnectivity" 2021-06-16 15:17:37 +00:00
Lorenzo Colitti
f77e1e6cb7 [automerger skipped] Correctly dump IPv4 downstream flows. am: 175fefc795 am: 6009cf9746 -s ours
am skip reason: Merged-In I93a82064c95027c7c63cb30baf8482ecddcbd09d with SHA-1 175fefc795 is already in history

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

Change-Id: Ib7c9a8b2982a088c2b573420c9b5e488c49c5a5e
2021-06-16 15:02:12 +00:00
Lorenzo Colitti
83a8e09189 [automerger skipped] Correctly dump IPv4 downstream flows. am: 175fefc795 -s ours am: 3f6f84cb43 -s ours
am skip reason: Merged-In I93a82064c95027c7c63cb30baf8482ecddcbd09d with SHA-1 8569168eda is already in history

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

Change-Id: I069b1784089c2db74a037b2f9e1eb253d75cf07a
2021-06-16 14:54:08 +00:00
Lorenzo Colitti
6009cf9746 Correctly dump IPv4 downstream flows. am: 175fefc795
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14965965

Change-Id: Id7033bb1863e7f4930c3e3da63641fadfb0c3ef2
2021-06-16 14:43:06 +00:00
Lorenzo Colitti
3f6f84cb43 [automerger skipped] Correctly dump IPv4 downstream flows. am: 175fefc795 -s ours
am skip reason: Merged-In I93a82064c95027c7c63cb30baf8482ecddcbd09d with SHA-1 8569168eda is already in history

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

Change-Id: Ibc110544830d364d7489817469bed3b7ed6a55b0
2021-06-16 14:42:21 +00:00
Remi NGUYEN VAN
8b9302ef61 Merge "Make tests compatible with mockito-extended" am: ad7108ce34 am: c3d789bff1 am: aec3a5e548
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1737400

Change-Id: I34a18a9becc0b932c6a7df9546de195e85c2076e
2021-06-16 14:05:31 +00:00
Remi NGUYEN VAN
aec3a5e548 Merge "Make tests compatible with mockito-extended" am: ad7108ce34 am: c3d789bff1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1737400

Change-Id: Ie5b04c5ea05d330dcc97d098720b08d4797927de
2021-06-16 13:56:01 +00:00
Remi NGUYEN VAN
c3d789bff1 Merge "Make tests compatible with mockito-extended" am: ad7108ce34
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1737400

Change-Id: I3c6de9b5da64e3bb26b1dc75e9184cf373d313fe
2021-06-16 13:34:34 +00:00
Lorenzo Colitti
175fefc795 Correctly dump IPv4 downstream flows.
The current code does not print these correctly: it prints the
public address twice and then the NAT address. Fix this to print
the src, nat, and dst addresses.

Also dump the output MAC address.

Example output:

    IPv4 Upstream: [inDstMac] iif(iface) src -> nat -> dst [outDstMac] age
      [66:f1:6f:d8:66:0a] 31(31) 192.168.146.173:48594 -> 11(rmnet_data1) 100.100.109.185:48594 -> 8.8.8.8:853 [00:00:00:00:00:00] 32305ms
      [66:f1:6f:d8:66:0a] 31(31) 192.168.146.173:45806 -> 11(rmnet_data1) 100.100.109.185:45806 -> 8.8.4.4:853 [00:00:00:00:00:00] 32305ms
    IPv4 Downstream: [inDstMac] iif(iface) src -> nat -> dst [outDstMac] age
      [00:00:00:00:00:00] 11(rmnet_data1) 8.8.8.8:853 -> 31(31) 100.100.109.185:48594 -> 192.168.146.173:48594 [0e:a8:7f:ba:76:48] 32305ms
      [00:00:00:00:00:00] 11(rmnet_data1) 8.8.4.4:853 -> 31(31) 100.100.109.185:45806 -> 192.168.146.173:45806 [0e:a8:7f:ba:76:48] 32305ms

Test: manual
Bug: 190783768
Original-Change: https://android-review.googlesource.com/1737399
Merged-In: I93a82064c95027c7c63cb30baf8482ecddcbd09d
Change-Id: I93a82064c95027c7c63cb30baf8482ecddcbd09d
2021-06-16 13:25:33 +00:00
Remi NGUYEN VAN
ad7108ce34 Merge "Make tests compatible with mockito-extended" 2021-06-16 13:22:37 +00:00
TreeHugger Robot
6979be06ff [automerger skipped] Merge "Ignore testFactoryReset in instant app mode" into sc-dev am: 75eb9e6ba9 -s ours am: e28ff5fe5b -s ours
am skip reason: Merged-In Icd4a1b2316608ea03a4f7afb32e39400af71950c with SHA-1 766573f4f0 is already in history

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

Change-Id: Id4ad08a3135f9071d987c272df2f46fc9ccec1ef
2021-06-16 13:21:57 +00:00
TreeHugger Robot
df92619a0c [automerger skipped] Merge "Ignore testFactoryReset in instant app mode" into sc-dev am: 75eb9e6ba9 am: 65e4008df2 -s ours
am skip reason: Merged-In Icd4a1b2316608ea03a4f7afb32e39400af71950c with SHA-1 8afa20e5d2 is already in history

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

Change-Id: I1efb14854be3eec7e116526942cae46530e7f495
2021-06-16 13:21:37 +00:00
TreeHugger Robot
65e4008df2 Merge "Ignore testFactoryReset in instant app mode" into sc-dev am: 75eb9e6ba9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14965964

Change-Id: Ic8dd87cdd344d5ac88d195faf1d510679f5c30c7
2021-06-16 13:08:50 +00:00
TreeHugger Robot
e28ff5fe5b [automerger skipped] Merge "Ignore testFactoryReset in instant app mode" into sc-dev am: 75eb9e6ba9 -s ours
am skip reason: Merged-In Icd4a1b2316608ea03a4f7afb32e39400af71950c with SHA-1 8afa20e5d2 is already in history

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

Change-Id: I3c91648151c19e08127bc6692c6d94e6ab7f3b0c
2021-06-16 13:07:47 +00:00
TreeHugger Robot
75eb9e6ba9 Merge "Ignore testFactoryReset in instant app mode" into sc-dev 2021-06-16 12:56:27 +00:00
Junyu Lai
a90dcdbe31 Merge changes I627dcd0f,I81abc174,Id7948d21 am: 75090fb64e am: 93b8b38683 am: 8aa17e2a6a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1731450

Change-Id: I248bec62a0fd97ee8cdf2a70b35134429b211443
2021-06-16 12:25:56 +00:00
Lorenzo Colitti
3c39e58036 [automerger skipped] Cleanup commit to remove @SkipPresubmit and fix nits am: 74ded77039 am: e276a5c2e0 -s ours
am skip reason: Merged-In Idde90ce5e4fc6f56ad617d5ba9735b1bcc2ce8cd with SHA-1 74ded77039 is already in history

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

Change-Id: I13179d19f230c40056f0c8074bd6fa176f2221e2
2021-06-16 12:14:31 +00:00
Lorenzo Colitti
e104973177 [automerger skipped] Verify kernel implementation of AES-CMAC am: c1a70345b7 am: 7a1c1fee31 -s ours
am skip reason: Merged-In I8b7ee9272722aebdd84ca02475a6107ef61287a9 with SHA-1 c1a70345b7 is already in history

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

Change-Id: I1f5f10a78e5d4d53515e440518922dc13d24530b
2021-06-16 12:14:25 +00:00
Junyu Lai
8aa17e2a6a Merge changes I627dcd0f,I81abc174,Id7948d21 am: 75090fb64e am: 93b8b38683
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1731450

Change-Id: I5588db4e540440e08f62c90d7369fb308a02b2f6
2021-06-16 12:14:22 +00:00
Lorenzo Colitti
d085a4d341 [automerger skipped] Verify kernel implementation of AES-XCBC am: 69b777ccc8 am: 816ff6966b -s ours
am skip reason: Merged-In I57e2bbed2954e4c7de906caae20390f7aebac0e3 with SHA-1 69b777ccc8 is already in history

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

Change-Id: I1c076fdd511b887d2b80f0311e5349fc586c9cd3
2021-06-16 12:14:14 +00:00
Lorenzo Colitti
f42c19a89b [automerger skipped] Cleanup commit to remove @SkipPresubmit and fix nits am: 74ded77039 -s ours am: bdde058c66 -s ours
am skip reason: Merged-In Idde90ce5e4fc6f56ad617d5ba9735b1bcc2ce8cd with SHA-1 a42e8215d8 is already in history

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

Change-Id: Idfdf8374c1a438c58afaee40426bcc2a321e8e6e
2021-06-16 12:09:53 +00:00
Lorenzo Colitti
ce8f17ce09 [automerger skipped] Verify kernel implementation of AES-CMAC am: c1a70345b7 -s ours am: f029ca2039 -s ours
am skip reason: Merged-In I8b7ee9272722aebdd84ca02475a6107ef61287a9 with SHA-1 1f423e06e2 is already in history

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

Change-Id: Ic708c0ad50a519fb0a679fdd0ebd3acf4727887e
2021-06-16 12:09:46 +00:00
Lorenzo Colitti
0e70f3c27d [automerger skipped] Verify kernel implementation of AES-XCBC am: 69b777ccc8 -s ours am: f0458218d8 -s ours
am skip reason: Merged-In I57e2bbed2954e4c7de906caae20390f7aebac0e3 with SHA-1 df24620850 is already in history

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

Change-Id: I564cccb78dfd9691f4092aeadb61571af1c0f737
2021-06-16 12:09:38 +00:00
Chiachang Wang
901eeb201d Add test for CM#setAcceptUnvalidated
The always bit is verified in NetworkAgentTest. There is no easy
configuration to set an explicitly selected network to accept an
unvalidated network. Verify the accepted case also in
NetworkAgentTest.

Bug: 186061922
Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest
Test: atest CtsNetTestCasesLatestSdk
Change-Id: I803eb975fb0b6c52d55b2310293bcad407d21f42
2021-06-16 20:09:08 +08:00
Chiachang Wang
589105d385 Add test for CM#setAcceptPartialConnectivity
Bug: 186061922
Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest
Test: atest CtsNetTestCasesLatestSdk
Change-Id: Iba312defb6f02896eac518d71d36f1ef3df3d00b
2021-06-16 20:06:15 +08:00
Lorenzo Colitti
e276a5c2e0 Cleanup commit to remove @SkipPresubmit and fix nits am: 74ded77039
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14991452

Change-Id: I342d1bbdd1f2a654a98d454f71a5e5e9654dba95
2021-06-16 12:00:03 +00:00
Lorenzo Colitti
7a1c1fee31 Verify kernel implementation of AES-CMAC am: c1a70345b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14991451

Change-Id: If2f59885fb8f8189138fa61e6d640bd19c8cb615
2021-06-16 11:59:54 +00:00
Lorenzo Colitti
816ff6966b Verify kernel implementation of AES-XCBC am: 69b777ccc8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14991432

Change-Id: I9d82303cd0b558e0c41f5f2fc1222ffa707ea6e9
2021-06-16 11:59:42 +00:00
Junyu Lai
93b8b38683 Merge changes I627dcd0f,I81abc174,Id7948d21 am: 75090fb64e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1731450

Change-Id: I3662e70034b16721e4ad1711654cb9f7eda45d35
2021-06-16 11:59:37 +00:00
Lorenzo Colitti
bdde058c66 [automerger skipped] Cleanup commit to remove @SkipPresubmit and fix nits am: 74ded77039 -s ours
am skip reason: Merged-In Idde90ce5e4fc6f56ad617d5ba9735b1bcc2ce8cd with SHA-1 a42e8215d8 is already in history

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

Change-Id: Ibec8e47c4e7d563ea540731ae4fff6685daf9936
2021-06-16 11:59:03 +00:00
Lorenzo Colitti
f029ca2039 [automerger skipped] Verify kernel implementation of AES-CMAC am: c1a70345b7 -s ours
am skip reason: Merged-In I8b7ee9272722aebdd84ca02475a6107ef61287a9 with SHA-1 1f423e06e2 is already in history

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

Change-Id: Iea0c8aa1fc786536f2dd5ef65ffbcc6057f062fe
2021-06-16 11:58:56 +00:00
Lorenzo Colitti
f0458218d8 [automerger skipped] Verify kernel implementation of AES-XCBC am: 69b777ccc8 -s ours
am skip reason: Merged-In I57e2bbed2954e4c7de906caae20390f7aebac0e3 with SHA-1 df24620850 is already in history

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

Change-Id: I5608fc7ea1a0b6696365a36aafb34e0040dc7284
2021-06-16 11:58:47 +00:00
Lorenzo Colitti
b3de70edef Merge "Correctly dump IPv4 downstream flows." am: a8afcd3b0e am: 18e6921d00 am: 6f3e90c2e5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1737399

Change-Id: I3d3ea4733689c2421fa9e2727bdd41f41fcb54e6
2021-06-16 11:50:01 +00:00
Remi NGUYEN VAN
4ca7a11543 Merge "Remove ConnectivityServiceTest signature perms use" am: 54c7434f0d am: 96ad425c5e am: 595dda3604
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1736615

Change-Id: I7dd3c5e7da9097ebedd7f4a836d4e78ef9bf08e5
2021-06-16 11:49:54 +00:00