LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,029 Commits 2 Branches 0 Tags
81d2adca153ce004b1369c9741ff08698455fc0f
Commit Graph

42029 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xin Li
81d2adca15 [automerger skipped] DO NOT MERGE - Merge RQ3A.210605.005 am: e7fde0c39a -s ours am: 5ba981c20a -s ours 
am skip reason: Merged-In I524644366a398b34de8f659d0d0d275f3f513c0c with SHA-1 d6d3bf0b89 is already in history

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

Change-Id: Icdf0f317488c7b1b7f39acffdd5b1f1219ecf51d
 2021-06-21 06:42:44 +00:00
Xin Li
5ba981c20a [automerger skipped] DO NOT MERGE - Merge RQ3A.210605.005 am: e7fde0c39a -s ours 
am skip reason: Merged-In I524644366a398b34de8f659d0d0d275f3f513c0c with SHA-1 d6d3bf0b89 is already in history

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

Change-Id: I2ba01e9d20b85825c557420b2e3a330cfdb41832
 2021-06-21 06:10:47 +00:00
Xin Li
e7fde0c39a DO NOT MERGE - Merge RQ3A.210605.005 
Bug: 190855093
Merged-In: I524644366a398b34de8f659d0d0d275f3f513c0c
Change-Id: I19bfd3cbd9f65d7936d9cbcbd840c96009f3a575
 2021-06-18 12:24:45 -07:00
Lucas Lin
996e157558 [automerger skipped] Merge "Send a proxy broadcast when apps moved from/to a VPN" into sc-dev am: 1b64ae6b87 -s ours 
am skip reason: Merged-In Ifa103dd66394026d752b407a1bee740c9fcdad2b with SHA-1 53e8a267ab is already in history

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

Change-Id: I2670aec83b31599e59dcd5f0e55474cdd13f253b
 2021-06-18 03:00:52 +00:00
Lucas Lin
63f7b0c405 [automerger skipped] Merge "Add a test to check if the VPN type is set or not" into sc-dev am: 013cf220f0 -s ours 
am skip reason: Merged-In I7ed5989ec767494c1033dc01242b32724e120c4e with SHA-1 816cc626c8 is already in history

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

Change-Id: I734b02a07f5b9ab4c5602e2b0741da45ac553187
 2021-06-18 03:00:41 +00:00
Lucas Lin
1b64ae6b87 Merge "Send a proxy broadcast when apps moved from/to a VPN" into sc-dev 2021-06-18 02:47:24 +00:00
Lucas Lin
013cf220f0 Merge "Add a test to check if the VPN type is set or not" into sc-dev 2021-06-18 02:46:50 +00:00
Frank Li
8e6e5177a6 [automerger skipped] Merge "Add CTS test for NetworkRequest.getCapabilities API" into sc-dev am: 799d1c6053 -s ours 
am skip reason: Merged-In I8504caa586bdb567d42047a96029dedc67968793 with SHA-1 50d8cd23d9 is already in history

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

Change-Id: I545eb6070ba5ff8da9122339719041754e39be27
 2021-06-18 01:56:32 +00:00
Frank Li
ba2a31fab3 [automerger skipped] Merge "Add test for ConnectivityService API isPrivateDnsBroken" into sc-dev am: 9097aaf5db -s ours 
am skip reason: Merged-In Ib45aa439683d48360652a91d7a0609dc82adda33 with SHA-1 e39741db1c is already in history

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

Change-Id: I9049636fee0c1d402094350ee43f80dcf7c78e57
 2021-06-18 01:56:27 +00:00
Frank Li
acddaabfff [automerger skipped] Merge "Add CTS test for API setLegacyExtraInfo" into sc-dev am: a9602dc5d3 -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: I576083eea68317716d7fcd278d489e03664fbaaf
 2021-06-18 01:56:02 +00:00
Frank Li
799d1c6053 Merge "Add CTS test for NetworkRequest.getCapabilities API" into sc-dev 2021-06-18 01:37:20 +00:00
Frank Li
9097aaf5db Merge "Add test for ConnectivityService API isPrivateDnsBroken" into sc-dev 2021-06-18 01:37:08 +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
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
f8e2e20f32 Add CTS test for NetworkRequest.getCapabilities API 
Bug: 189162033
Test: atest android.net.cts.NetworkRequestTest
      atest CtsNetTestCasesLatestSdk:NetworkRequestTest
Original-Change: https://android-review.googlesource.com/1717737
Merged-In: I8504caa586bdb567d42047a96029dedc67968793
Change-Id: I8504caa586bdb567d42047a96029dedc67968793
 2021-06-17 13:42:34 +00:00
Frank Li
3a48843e49 Add test for ConnectivityService API isPrivateDnsBroken 
Bug: 189161363
Test: atest android.net.cts.ConnectivityManagerTest
      atest CtsNetTestCasesLatestSdk:ConnectivityManagerTest
Original-Change: https://android-review.googlesource.com/1719395
Merged-In: Ib45aa439683d48360652a91d7a0609dc82adda33
Change-Id: Ib45aa439683d48360652a91d7a0609dc82adda33
 2021-06-17 13:22:39 +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
Lucas Lin
b63f479a02 Add a test to check if the VPN type is set or not 
Bug: 184261389
Test: atest CtsHostsideNetworkTests:HostsideVpnTests#testDefault
Original-Change: https://android-review.googlesource.com/1733785
Merged-In: I7ed5989ec767494c1033dc01242b32724e120c4e
Change-Id: I7ed5989ec767494c1033dc01242b32724e120c4e
 2021-06-17 11:15:17 +00:00
Lucas Lin
950a65f8cc Send a proxy broadcast when apps moved from/to a VPN 
When the apps moved from/to a VPN, a proxy broadcast is needed to
inform the apps that the proxy might be changed since the default
network satisfied by the apps might also changed.
Since the framework does not track the defautlt network of every
apps, thus, this is done when:
  1. VPN connects/disconnects.
  2. List of uids that apply to the VPN has changed.
While 1 is already covered by the current design, the CL implements
2 in order to fulfill the case that different networks have
different proxies.

Bug: 178727215
Test: atest FrameworksNetTests
Original-Change: https://android-review.googlesource.com/1717735
Merged-In: Ifa103dd66394026d752b407a1bee740c9fcdad2b
Change-Id: Ifa103dd66394026d752b407a1bee740c9fcdad2b
 2021-06-17 11:10:46 +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
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
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
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
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
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
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
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
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