LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,722 Commits 2 Branches 0 Tags
c045f111c869dae84a42dd1c452c55bb04cabe2f
Commit Graph

43722 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frank Li
c045f111c8 [automerger skipped] Merge "Add CTS test for API setLegacyExtraInfo" into sc-dev am: a9602dc5d3 am: ee4006fa06 -s ours 
am skip reason: Merged-In Ief14f6de0cb6913da944414f0b134eb04346425f with SHA-1 0fd78de2c6 is already in history

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

Change-Id: Ib2b5de97323c2be0b77c4412c69f00ea0f35c500
 2021-06-18 02:12:39 +00:00
Frank Li
ee4006fa06 Merge "Add CTS test for API setLegacyExtraInfo" into sc-dev am: a9602dc5d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15013233

Change-Id: I39ebd7e74d548971af7e6581ce77f32b9be82208
 2021-06-18 01:57:18 +00:00
Frank Li
a9602dc5d3 Merge "Add CTS test for API setLegacyExtraInfo" into sc-dev 2021-06-18 01:36:44 +00:00
James Mattis
5df769ffed [automerger skipped] Merge "Update CS so that per-app OEM APIs can be tested" into sc-dev am: 24ab50b086 -s ours am: 6b23638b99 -s ours 
am skip reason: Merged-In I5a47dcece31749293f080af060218d827082eb67 with SHA-1 b7ca034306 is already in history

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

Change-Id: I798d6b12750270b9312cee54f1d019c05acc7689
 2021-06-17 16:41:18 +00:00
James Mattis
c0101eac82 [automerger skipped] Merge "Update CS so that per-app OEM APIs can be tested" into sc-dev am: 24ab50b086 am: a4e465da0b -s ours 
am skip reason: Merged-In I5a47dcece31749293f080af060218d827082eb67 with SHA-1 fa270db5f7 is already in history

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

Change-Id: I9105cd250812118609f36cf8e4af9922bef04bd4
 2021-06-17 16:40:58 +00:00
James Mattis
a4e465da0b Merge "Update CS so that per-app OEM APIs can be tested" into sc-dev am: 24ab50b086 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14993471

Change-Id: I0f8b1a947ca6e738bc21ee2c49e2412b2f99997d
 2021-06-17 16:28:42 +00:00
James Mattis
6b23638b99 [automerger skipped] Merge "Update CS so that per-app OEM APIs can be tested" into sc-dev am: 24ab50b086 -s ours 
am skip reason: Merged-In I5a47dcece31749293f080af060218d827082eb67 with SHA-1 fa270db5f7 is already in history

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

Change-Id: I1183777cab37fadd8a335f66cca13e95fcaca158
 2021-06-17 16:27:27 +00:00
James Mattis
24ab50b086 Merge "Update CS so that per-app OEM APIs can be tested" into sc-dev 2021-06-17 16:08:58 +00:00
Frank Li
b7eebde98a Add CTS test for API setLegacyExtraInfo 
Adding in-depth test in NetworkAgentTest
Bug: 187040803
Test: atest CtsNetTestCasesLatestSdk:android.net.NetworkAgentConfigTest
      atest CtsNetTestCases:android.net.NetworkAgentConfigTest
Original-Change: https://android-review.googlesource.com/1719131
Merged-In: Ief14f6de0cb6913da944414f0b134eb04346425f
Change-Id: Ief14f6de0cb6913da944414f0b134eb04346425f
 2021-06-17 13:00:57 +00:00
Junyu Lai
2d20d2a184 [automerger skipped] Fix expectCallback does not fail when no callback received am: 52e3fa127a -s ours am: 22a9c63234 -s ours 
am skip reason: Merged-In I627dcd0f57b6ef4197d16e6c1ec0c53e675ab055 with SHA-1 52e3fa127a is already in history

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

Change-Id: Iec4ae32af71c8cbed57697733c88e0d7e202dba4
 2021-06-17 10:52:10 +00:00
Junyu Lai
8039db731a [automerger skipped] Add CTS for registerBestMatchingNetworkCallback am: 512efafd32 -s ours am: eb50be9103 -s ours 
am skip reason: Merged-In I81abc1742a3aa965b444d0196f4eaa2393dcad1c with SHA-1 512efafd32 is already in history

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

Change-Id: Icb7cacf12d3f2000b650b7f993a4e89af46c4b07
 2021-06-17 10:52:08 +00:00
Junyu Lai
54bb7c9ed6 [automerger skipped] No-op refactoring of NetworkAgentTest am: e5bdc06735 -s ours am: c0b2c8af16 -s ours 
am skip reason: Merged-In Id7948d218b78ae0abf253ca8925e787362ac463f with SHA-1 e5bdc06735 is already in history

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

Change-Id: Ib65c0bff5a07638e9335b02dc2494f7e3d6a6176
 2021-06-17 10:52:06 +00:00
Junyu Lai
d0cf322b25 [automerger skipped] Fix expectCallback does not fail when no callback received am: 52e3fa127a am: 00b03beb31 -s ours 
am skip reason: Merged-In I627dcd0f57b6ef4197d16e6c1ec0c53e675ab055 with SHA-1 63e3dedfee is already in history

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

Change-Id: I8f8c94bc99b5f25cc26f7558c2ed2aac173461cd
 2021-06-17 10:51:46 +00:00
Junyu Lai
248c22422b [automerger skipped] Add CTS for registerBestMatchingNetworkCallback am: 512efafd32 am: d576a4d0a9 -s ours 
am skip reason: Merged-In I81abc1742a3aa965b444d0196f4eaa2393dcad1c with SHA-1 eb5451dd35 is already in history

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

Change-Id: I5890c0a9e6c8815f7e3fa3ba21997cb91269152e
 2021-06-17 10:51:44 +00:00
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
00b03beb31 Fix expectCallback does not fail when no callback received am: 52e3fa127a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14683929

Change-Id: Icd7743a03627382bf797b859b48b02bbee635b1f
 2021-06-17 10:40:09 +00:00
Junyu Lai
d576a4d0a9 Add CTS for registerBestMatchingNetworkCallback am: 512efafd32 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14673220

Change-Id: I975a03a391d09787975a9572aa097b47709f817e
 2021-06-17 10:40:07 +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
Junyu Lai
22a9c63234 [automerger skipped] Fix expectCallback does not fail when no callback received am: 52e3fa127a -s ours 
am skip reason: Merged-In I627dcd0f57b6ef4197d16e6c1ec0c53e675ab055 with SHA-1 63e3dedfee is already in history

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

Change-Id: Ia68e6a38b5120379129d206524202ffe1d7f918e
 2021-06-17 10:39:09 +00:00
Junyu Lai
eb50be9103 [automerger skipped] Add CTS for registerBestMatchingNetworkCallback am: 512efafd32 -s ours 
am skip reason: Merged-In I81abc1742a3aa965b444d0196f4eaa2393dcad1c with SHA-1 eb5451dd35 is already in history

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

Change-Id: I50a026db782a305e24694e65d05c0d0d320cdbdc
 2021-06-17 10:39:07 +00:00
Junyu Lai
c0b2c8af16 [automerger skipped] No-op refactoring of NetworkAgentTest am: e5bdc06735 -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: If977ed563125b0d9f4afe0757d951c500d2366eb
 2021-06-17 10:39:05 +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
52e3fa127a Fix expectCallback does not fail when no callback received 
This hides 3 bugs where,
  1. In Android S, onNetworkRequested is no longer broadcasted
     by ConnectivityService in any condition. However, the test
     still passes since assertion does not fail when no callback
     received. Ignore the test on S+ devices since the behavior
     changed on S or later devices.
  2. Test network agent is not registered, but the test still
     passes.
  3. Test network agent does not fulfill the request that kept
     the network up, so the test fails since the test network
     is not needed and be torn down.

Test: android.net.NetworkProviderTest on R/S device
Bug: 189074532
Merged-In: I627dcd0f57b6ef4197d16e6c1ec0c53e675ab055
Change-Id: I627dcd0f57b6ef4197d16e6c1ec0c53e675ab055
  (cherry-picked from aosp/1731450)
 2021-06-17 09:03:11 +00:00
Junyu Lai
512efafd32 Add CTS for registerBestMatchingNetworkCallback 
Bug: 188657173
Test: atest CtsNetTestCases:android.net.cts.NetworkAgentTest \
      CtsNetTestCases:android.net.cts.ConnectivityManagerTest
Test: atest CtsNetTestCasesLatestSdk:android.net.cts.NetworkAgentTest \
      CtsNetTestCasesLatestSdk:android.net.cts.ConnectivityManagerTest
      on R device
Merged-In: I81abc1742a3aa965b444d0196f4eaa2393dcad1c
Change-Id: I81abc1742a3aa965b444d0196f4eaa2393dcad1c
  (cherry-picked from aosp/1727824)
 2021-06-17 09:02:17 +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