Commit Graph

43676 Commits

Author SHA1 Message Date
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
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
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
Junyu Lai
75090fb64e Merge changes I627dcd0f,I81abc174,Id7948d21
* changes:
  Fix expectCallback does not fail when no callback received
  Add CTS for registerBestMatchingNetworkCallback
  No-op refactoring of NetworkAgentTest
2021-06-16 11:46:34 +00:00
Lorenzo Colitti
6f3e90c2e5 Merge "Correctly dump IPv4 downstream flows." am: a8afcd3b0e am: 18e6921d00
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1737399

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

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

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

Change-Id: I0f9c3677f135dd48fc73da08661497190f8d3c20
2021-06-16 11:24:51 +00:00
Lorenzo Colitti
a8afcd3b0e Merge "Correctly dump IPv4 downstream flows." 2021-06-16 11:15:30 +00:00
Remi NGUYEN VAN
54c7434f0d Merge "Remove ConnectivityServiceTest signature perms use" 2021-06-16 11:09:05 +00:00
Lorenzo Colitti
6f5f2e1b6a [automerger skipped] Verify kernel implementation of AES-CTR am: 816c800df3 am: 41d5080646 -s ours
am skip reason: Merged-In Ib626a6c3999b7d682d0858e92d0dbb5138fdc45d with SHA-1 816c800df3 is already in history

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

Change-Id: Ic566a148e41e78450eb6e025be22ad2bec94499d
2021-06-16 11:01:55 +00:00
Lorenzo Colitti
1092846a49 [automerger skipped] Verify kernel implementation of ChaCha20Poly1305 am: 09527d67ca am: 4d97e41293 -s ours
am skip reason: Merged-In Ia29540c7fd6848a89bfa2d25c6a87921e45d98da with SHA-1 09527d67ca is already in history

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

Change-Id: Ie6731fdecde14a72141258aed375c42a8b0229a4
2021-06-16 11:01:53 +00:00
Lorenzo Colitti
92c1e4f445 [automerger skipped] Support algorithm configurability in PacketUtils EspHeader am: 2e65e9fa88 am: 5935f1ea81 -s ours
am skip reason: Merged-In I53f59815d6cb879dae622fcbd17616564a97111a with SHA-1 2e65e9fa88 is already in history

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

Change-Id: I140d074ed133a5dcdb17e982b4c890e05baf964e
2021-06-16 11:01:51 +00:00
Yan Yan
4ecd509027 [automerger skipped] Set up and tear down test network in TestNetworkRunnable am: 144ae3c76a am: b44d08eece -s ours
am skip reason: Merged-In I0e08a6ea299e6ad94d69806a2d76fa155653b62a with SHA-1 144ae3c76a is already in history

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

Change-Id: Iaf466a4446aeecf34ea54dbbe5fe56df596f02bd
2021-06-16 11:01:47 +00:00
Lorenzo Colitti
e5ca7087a8 [automerger skipped] Verify kernel implementation of AES-CTR am: 816c800df3 -s ours am: 2baeaa8d16 -s ours
am skip reason: Merged-In Ib626a6c3999b7d682d0858e92d0dbb5138fdc45d with SHA-1 0c60279648 is already in history

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

Change-Id: I2fe91d23188fb5863d022c25bd038d0bf58ce551
2021-06-16 10:54:36 +00:00
Lorenzo Colitti
143197a1bc [automerger skipped] Verify kernel implementation of ChaCha20Poly1305 am: 09527d67ca -s ours am: f9b6e17eed -s ours
am skip reason: Merged-In Ia29540c7fd6848a89bfa2d25c6a87921e45d98da with SHA-1 80be81b302 is already in history

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

Change-Id: Idfdeb7d46264f5bd5cea170433565aee71a50a8d
2021-06-16 10:54:34 +00:00
Lorenzo Colitti
68251e07c0 [automerger skipped] Support algorithm configurability in PacketUtils EspHeader am: 2e65e9fa88 -s ours am: 677cdea1a4 -s ours
am skip reason: Merged-In I53f59815d6cb879dae622fcbd17616564a97111a with SHA-1 00db30f3a0 is already in history

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

Change-Id: I7a03ec1c9b21630a087169c424ebbb0ce5ef1ebd
2021-06-16 10:54:32 +00:00
Yan Yan
1e3a546148 [automerger skipped] Set up and tear down test network in TestNetworkRunnable am: 144ae3c76a -s ours am: ff18d2e4d1 -s ours
am skip reason: Merged-In I0e08a6ea299e6ad94d69806a2d76fa155653b62a with SHA-1 29487b12d5 is already in history

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

Change-Id: I292d260a4da7911ede2bbc5cbfe95b028acf3e69
2021-06-16 10:54:30 +00:00
Lorenzo Colitti
41d5080646 Verify kernel implementation of AES-CTR am: 816c800df3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14988702

Change-Id: I216c6ebe834839f8be089cf469a19045293452c2
2021-06-16 10:45:45 +00:00
Lorenzo Colitti
4d97e41293 Verify kernel implementation of ChaCha20Poly1305 am: 09527d67ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14988701

Change-Id: I096ae20fda86a2cc593b516079fd072183ba672e
2021-06-16 10:45:43 +00:00
Lorenzo Colitti
5935f1ea81 Support algorithm configurability in PacketUtils EspHeader am: 2e65e9fa88
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14990605

Change-Id: I40c2a64de05388918d35748ad99591f73000ca79
2021-06-16 10:45:41 +00:00
Yan Yan
b44d08eece Set up and tear down test network in TestNetworkRunnable am: 144ae3c76a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14988700

Change-Id: I57411f845503f0f7d1bdc2800d16208ba6b46f2e
2021-06-16 10:45:39 +00:00
Lorenzo Colitti
2baeaa8d16 [automerger skipped] Verify kernel implementation of AES-CTR am: 816c800df3 -s ours
am skip reason: Merged-In Ib626a6c3999b7d682d0858e92d0dbb5138fdc45d with SHA-1 0c60279648 is already in history

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

Change-Id: Ie93af16e53168f4c00bf6c21eb9bc02b15fa74ee
2021-06-16 10:44:33 +00:00
Lorenzo Colitti
f9b6e17eed [automerger skipped] Verify kernel implementation of ChaCha20Poly1305 am: 09527d67ca -s ours
am skip reason: Merged-In Ia29540c7fd6848a89bfa2d25c6a87921e45d98da with SHA-1 80be81b302 is already in history

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

Change-Id: I11d84b5167b36e2a77543ee492ea7fbe7aebddc5
2021-06-16 10:44:31 +00:00
Lorenzo Colitti
677cdea1a4 [automerger skipped] Support algorithm configurability in PacketUtils EspHeader am: 2e65e9fa88 -s ours
am skip reason: Merged-In I53f59815d6cb879dae622fcbd17616564a97111a with SHA-1 00db30f3a0 is already in history

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

Change-Id: I25d0b5a71654b240cad649f755ce19176328d3a0
2021-06-16 10:44:29 +00:00
Yan Yan
ff18d2e4d1 [automerger skipped] Set up and tear down test network in TestNetworkRunnable am: 144ae3c76a -s ours
am skip reason: Merged-In I0e08a6ea299e6ad94d69806a2d76fa155653b62a with SHA-1 29487b12d5 is already in history

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

Change-Id: I8e3e012a0cb14012e025ba5d2e0efa416b1d3c1e
2021-06-16 10:44:26 +00:00
Remi NGUYEN VAN
c9c745f2f2 Make tests compatible with mockito-extended
This does not change the mockito library to use mockito-extended in
FrameworksNetTests, but changes the tests so that they would pass if
built against that library.

This is useful to run FrameworksNetTests in a common test suite with
other tests that use mockito-extended, for example a common connectivity
coverage test target.

The change includes increasing the test timeout in
ConnectivityServiceTest, as mockito-extended can have performance impact
(~3 times on hwasan builds). This change does not make tests run slower
in the current FrameworksNetTests suite though.

Bug: 187935317
Test: atest FrameworksNetTests
Change-Id: I61fa371e8957037075a2617a014647ff062207c6
2021-06-16 17:53:08 +09:00