LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,182 Commits 2 Branches 0 Tags
53d4a60e34a861e0ef38d7b6cd33549684e045eb
Commit Graph

5182 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chiachang Wang
53d4a60e34 [automerger skipped] Merge "Update logic for checking NetworkSpecifier" into rvc-dev am: 0d39e96477 -s ours am: c48c2dcf2e -s ours am: 202dc6d0b3 -s ours am: 9cecfeedff -s ours 
am skip reason: Change-Id I14e2a5e629051e243f3b892b608cb1c6195cd8ed with SHA-1 6f63ef0e47 is in history

Change-Id: I7a1d95972e2006725e896167511e2edb4ce1b5e9
 2020-04-23 03:09:03 +00:00
Remi NGUYEN VAN
f56c15f119 [automerger skipped] Merge "Fix test initialization errors on Q" into rvc-dev am: 203e783ccd -s ours am: 390874b40d -s ours am: 5b647e18e2 -s ours am: bb81743a4c -s ours 
am skip reason: Change-Id I262b54c6897ed755adaeb2b118c638320634f7a1 with SHA-1 a7f8f2d01c is in history

Change-Id: I497a0135329d7b9c48a267b602cf3b77cd4cfda3
 2020-04-23 03:08:36 +00:00
Chiachang Wang
9cecfeedff [automerger skipped] Merge "Update logic for checking NetworkSpecifier" into rvc-dev am: 0d39e96477 -s ours am: c48c2dcf2e -s ours am: 202dc6d0b3 -s ours 
am skip reason: Change-Id I14e2a5e629051e243f3b892b608cb1c6195cd8ed with SHA-1 6f63ef0e47 is in history

Change-Id: Ib5442c1729c7d45ec3f022d4f39aa1d296859d85
 2020-04-23 02:54:05 +00:00
Remi NGUYEN VAN
bb81743a4c [automerger skipped] Merge "Fix test initialization errors on Q" into rvc-dev am: 203e783ccd -s ours am: 390874b40d -s ours am: 5b647e18e2 -s ours 
am skip reason: Change-Id I262b54c6897ed755adaeb2b118c638320634f7a1 with SHA-1 a7f8f2d01c is in history

Change-Id: Ibbc1420531b16ac290976c14dfb69dc4b06a200a
 2020-04-23 02:53:43 +00:00
Chiachang Wang
202dc6d0b3 [automerger skipped] Merge "Update logic for checking NetworkSpecifier" into rvc-dev am: 0d39e96477 -s ours am: c48c2dcf2e -s ours 
am skip reason: Change-Id I14e2a5e629051e243f3b892b608cb1c6195cd8ed with SHA-1 6f63ef0e47 is in history

Change-Id: Iea699dfe2da028a7af6c21bb7ded2ef90cb728a2
 2020-04-23 02:36:19 +00:00
Remi NGUYEN VAN
5b647e18e2 [automerger skipped] Merge "Fix test initialization errors on Q" into rvc-dev am: 203e783ccd -s ours am: 390874b40d -s ours 
am skip reason: Change-Id I262b54c6897ed755adaeb2b118c638320634f7a1 with SHA-1 a7f8f2d01c is in history

Change-Id: I8aa7b0ce731fbde226c4f1ebdddcd66dd1e82c5f
 2020-04-23 02:36:10 +00:00
Chiachang Wang
c48c2dcf2e [automerger skipped] Merge "Update logic for checking NetworkSpecifier" into rvc-dev am: 0d39e96477 -s ours 
am skip reason: Change-Id I14e2a5e629051e243f3b892b608cb1c6195cd8ed with SHA-1 6f63ef0e47 is in history

Change-Id: I5553d41e5983952607edb47a34326a91f3523a07
 2020-04-23 02:27:54 +00:00
Chiachang Wang
0d39e96477 Merge "Update logic for checking NetworkSpecifier" into rvc-dev 2020-04-23 02:27:03 +00:00
Remi NGUYEN VAN
390874b40d [automerger skipped] Merge "Fix test initialization errors on Q" into rvc-dev am: 203e783ccd -s ours 
am skip reason: Change-Id I262b54c6897ed755adaeb2b118c638320634f7a1 with SHA-1 a7f8f2d01c is in history

Change-Id: I13a5e49edd39e64b9202333932eae307c3e19ede
 2020-04-23 02:22:29 +00:00
Remi NGUYEN VAN
203e783ccd Merge "Fix test initialization errors on Q" into rvc-dev 2020-04-23 02:10:04 +00:00
Treehugger Robot
36e4781181 Update logic for checking NetworkSpecifier 
We cannot test using WifiNetworkSpecifier, because the matching
behaviour for null WifiNetworkSpecifier changed between Q and R.
Replace WifiNetworkSpecifier with MatchAllNetworkSpecifier and
TelephonyNetworkSpecifier that behave the same in both Q and R
to verify.

Bug: 154451660
Test: atest CtsNetTestCasesLatestSdk:android.net.cts.NetworkRequestTest
      on aosp and internal build
Change-Id: I14e2a5e629051e243f3b892b608cb1c6195cd8ed
Merged-In: I14e2a5e629051e243f3b892b608cb1c6195cd8ed
(cherry picked from commit 902d572ca8)
 2020-04-23 00:40:37 +00:00
Treehugger Robot
902d572ca8 Merge "Update logic for checking NetworkSpecifier" am: eef8bc2050 am: 22bda590b7 am: 8f4fe7b880 am: 09b7b84b49 am: 1bfb25e2f7 
Change-Id: I90ae0c717b086750ad5cd067bb71867540aa2e08
 2020-04-22 16:58:09 +00:00
Treehugger Robot
1bfb25e2f7 Merge "Update logic for checking NetworkSpecifier" am: eef8bc2050 am: 22bda590b7 am: 8f4fe7b880 am: 09b7b84b49 
Change-Id: I009d416ebe46e9ac4458973b025af2fc943f26af
 2020-04-22 16:51:22 +00:00
Treehugger Robot
09b7b84b49 Merge "Update logic for checking NetworkSpecifier" am: eef8bc2050 am: 22bda590b7 am: 8f4fe7b880 
Change-Id: I9a81c742ad5f929c4ddd7dba68fa101556be2a96
 2020-04-22 16:37:22 +00:00
Treehugger Robot
8f4fe7b880 Merge "Update logic for checking NetworkSpecifier" am: eef8bc2050 am: 22bda590b7 
Change-Id: If4ff3a3afc0385aed66ac954340b7d19f8396ccf
 2020-04-22 16:36:52 +00:00
Treehugger Robot
22bda590b7 Merge "Update logic for checking NetworkSpecifier" am: eef8bc2050 
Change-Id: Ifd4c3b1572c8957284ee57adcdc39ca8b9553859
 2020-04-22 16:23:23 +00:00
Treehugger Robot
eef8bc2050 Merge "Update logic for checking NetworkSpecifier" 2020-04-22 16:11:26 +00:00
Chiachang Wang
6f63ef0e47 Update logic for checking NetworkSpecifier 
We cannot test using WifiNetworkSpecifier, because the matching
behaviour for null WifiNetworkSpecifier changed between Q and R.
Replace WifiNetworkSpecifier with MatchAllNetworkSpecifier and
TelephonyNetworkSpecifier that behave the same in both Q and R
to verify.

Bug: 154451660
Test: atest CtsNetTestCasesLatestSdk:android.net.cts.NetworkRequestTest
      on aosp and internal build
Change-Id: I14e2a5e629051e243f3b892b608cb1c6195cd8ed
 2020-04-22 22:18:50 +08:00
Chiachang Wang
f70456b723 [automerger skipped] Merge "Check target transport type for meterness change" into rvc-dev am: d5cfa43ee2 -s ours am: 8ec2c4cf63 -s ours am: a968ebbdd3 -s ours am: bf856bc2fa -s ours 
am skip reason: Change-Id I75dab1a00bbe1a1c75b548a6ce4ae3eacd325d92 with SHA-1 1136e51d55 is in history

Change-Id: I07b5c3012475f83b5dae9944a3dc27642e323822
 2020-04-22 14:10:57 +00:00
Chiachang Wang
ca72d58d21 [automerger skipped] Merge "Check target transport type for meterness change" into rvc-dev am: d5cfa43ee2 am: 471fd9a182 -s ours am: 679337e07e -s ours am: 8f953f23e3 -s ours 
am skip reason: Change-Id I75dab1a00bbe1a1c75b548a6ce4ae3eacd325d92 with SHA-1 6aac2067f6 is in history

Change-Id: I1fcbc0cad49e3cff197efa9e60d4a458b958c8c1
 2020-04-22 14:10:40 +00:00
Chiachang Wang
bf856bc2fa [automerger skipped] Merge "Check target transport type for meterness change" into rvc-dev am: d5cfa43ee2 -s ours am: 8ec2c4cf63 -s ours am: a968ebbdd3 -s ours 
am skip reason: Change-Id I75dab1a00bbe1a1c75b548a6ce4ae3eacd325d92 with SHA-1 1136e51d55 is in history

Change-Id: Ic4b04976ed779be84f6b52def094d905f723278a
 2020-04-22 13:56:24 +00:00
Chiachang Wang
8f953f23e3 [automerger skipped] Merge "Check target transport type for meterness change" into rvc-dev am: d5cfa43ee2 am: 471fd9a182 -s ours am: 679337e07e -s ours 
am skip reason: Change-Id I75dab1a00bbe1a1c75b548a6ce4ae3eacd325d92 with SHA-1 6aac2067f6 is in history

Change-Id: I2ad62a7144e1213b9832c387b0d91df5615ee463
 2020-04-22 13:56:19 +00:00
Chiachang Wang
a968ebbdd3 [automerger skipped] Merge "Check target transport type for meterness change" into rvc-dev am: d5cfa43ee2 -s ours am: 8ec2c4cf63 -s ours 
am skip reason: Change-Id I75dab1a00bbe1a1c75b548a6ce4ae3eacd325d92 with SHA-1 1136e51d55 is in history

Change-Id: Ie897c6860417628c2300483b2112cdb876f016d0
 2020-04-22 13:40:56 +00:00
Chiachang Wang
679337e07e [automerger skipped] Merge "Check target transport type for meterness change" into rvc-dev am: d5cfa43ee2 am: 471fd9a182 -s ours 
am skip reason: Change-Id I75dab1a00bbe1a1c75b548a6ce4ae3eacd325d92 with SHA-1 6aac2067f6 is in history

Change-Id: Iedb3236127ec6526bd32c322f9c6f053e1869ccc
 2020-04-22 13:40:26 +00:00
Chiachang Wang
8ec2c4cf63 [automerger skipped] Merge "Check target transport type for meterness change" into rvc-dev am: d5cfa43ee2 -s ours 
am skip reason: Change-Id I75dab1a00bbe1a1c75b548a6ce4ae3eacd325d92 with SHA-1 6aac2067f6 is in history

Change-Id: I2350e0334ab809692ab98854e3bf8fd2329757d0
 2020-04-22 13:28:59 +00:00
Chiachang Wang
471fd9a182 Merge "Check target transport type for meterness change" into rvc-dev am: d5cfa43ee2 
Change-Id: I1fc0c0a641b14b7137d9db1cc7f157865f293a2b
 2020-04-22 13:28:44 +00:00
Lucas Lin
d30a81ab2a [automerger skipped] Merge "Revert "Pull service dumps to help debug test failures."" am: 6ca20ffe6d am: 1817f6f907 -s ours am: b2937bb815 am: 348dcab8cc am: 6f8b44ef89 
Change-Id: I5a407b0e73bc9233218ba98b13000bf0c017a955
 2020-04-22 08:31:43 +00:00
Lucas Lin
6f8b44ef89 [automerger skipped] Merge "Revert "Pull service dumps to help debug test failures."" am: 6ca20ffe6d am: 1817f6f907 -s ours am: b2937bb815 am: 348dcab8cc 
Change-Id: I680614e0a38a405e9d105ec124d61233e3672676
 2020-04-22 08:16:15 +00:00
Lucas Lin
348dcab8cc [automerger skipped] Merge "Revert "Pull service dumps to help debug test failures."" am: 6ca20ffe6d am: 1817f6f907 -s ours am: b2937bb815 
Change-Id: Ibb8529f7d817a1971abf66efc04fd5325d9c19cc
 2020-04-22 07:59:04 +00:00
Chiachang Wang
1136e51d55 Check target transport type for meterness change 
When test case updates the wifi network from unmetered to
metered, test case will wait for wifi network reconnect.
However, if other metered networks are also connected at
the same time, test case may mis-take the network as the
target network. Thus, add transport type check to ensure
the transport type of the network is the expected one.

Bug: 153400606
Test: atest CtsNetTestCasesLatestSdk:\
      android.net.cts.ConnectivityManagerTest#\
      testGetMultipathPreference
Change-Id: I75dab1a00bbe1a1c75b548a6ce4ae3eacd325d92
Merged-In: I75dab1a00bbe1a1c75b548a6ce4ae3eacd325d92
(cherry picked from commit 495971d7b6abc65e6d506072038f499682f59f4d)
 2020-04-22 07:52:57 +00:00
Chiachang Wang
ec261bc15d Merge "Check target transport type for meterness change" am: ac551dff33 am: 63592fd781 am: 8167ede0fd am: 82debfd479 am: 4f97f84178 
Change-Id: I044f18a677d4dbd7a5a1457f90992164ca7e07ea
 2020-04-22 07:45:16 +00:00
Lucas Lin
b2937bb815 [automerger skipped] Merge "Revert "Pull service dumps to help debug test failures."" am: 6ca20ffe6d am: 1817f6f907 -s ours 
am skip reason: skipped by user lucaslin

Change-Id: I9ec34a339681090c0aac16ad3f358bb240b2e8ea
 2020-04-22 07:37:52 +00:00
Chiachang Wang
4f97f84178 Merge "Check target transport type for meterness change" am: ac551dff33 am: 63592fd781 am: 8167ede0fd am: 82debfd479 
Change-Id: Ic9bdc557210f41b92b861b876fa5dc22bcb449dc
 2020-04-22 06:53:18 +00:00
Chiachang Wang
82debfd479 Merge "Check target transport type for meterness change" am: ac551dff33 am: 63592fd781 am: 8167ede0fd 
Change-Id: Iac8339af8c8fba20818815fb9b363bdb2abd41d4
 2020-04-22 06:36:58 +00:00
Chiachang Wang
8167ede0fd Merge "Check target transport type for meterness change" am: ac551dff33 am: 63592fd781 
Change-Id: I59bcca1b2bcbbf7991139a25350359eacba945e3
 2020-04-22 06:22:55 +00:00
Lucas Lin
1817f6f907 Merge "Revert "Pull service dumps to help debug test failures."" am: 6ca20ffe6d 
Change-Id: Idbd647d3713be01261672df343173d7057f155d0
 2020-04-22 06:05:06 +00:00
Chiachang Wang
63592fd781 Merge "Check target transport type for meterness change" am: ac551dff33 
Change-Id: Ie9e3f1c02c9cc6b51c423154561150768614ab44
 2020-04-22 06:04:56 +00:00
Lucas Lin
6ca20ffe6d Merge "Revert "Pull service dumps to help debug test failures."" 2020-04-22 05:56:52 +00:00
Chiachang Wang
ac551dff33 Merge "Check target transport type for meterness change" 2020-04-22 05:52:10 +00:00
Chiachang Wang
6aac2067f6 Check target transport type for meterness change 
When test case updates the wifi network from unmetered to
metered, test case will wait for wifi network reconnect.
However, if other metered networks are also connected at
the same time, test case may mis-take the network as the
target network. Thus, add transport type check to ensure
the transport type of the network is the expected one.

Bug: 153400606
Test: atest CtsNetTestCasesLatestSdk:\
      android.net.cts.ConnectivityManagerTest#\
      testGetMultipathPreference
Change-Id: I75dab1a00bbe1a1c75b548a6ce4ae3eacd325d92
 2020-04-22 05:51:39 +00:00
Tony Huang
89099548f8 Revert "Pull service dumps to help debug test failures." 
This reverts commit e3711ae317.

Reason for revert: Might cause build break on errorprone branch

Change-Id: Iddece3edf4b1e96fafb8b36282f58410a2476025
 2020-04-22 04:31:43 +00:00
Lucas Lin
5999ca62c8 [automerger skipped] Merge "Pull service dumps to help debug test failures." am: d8b6e3dfe8 am: f9b42ca13b -s ours am: a20c0fee65 -s ours am: 4216947af6 -s ours am: c93658141e -s ours 
am skip reason: Change-Id I93317c201a0ea06732e29154ab7e140735381f59 with SHA-1 09ae6d2645 is in history

Change-Id: I7a8ca1ffd6fe41a5e2ae8722e08cdb6cb0e640a3
 2020-04-22 04:16:27 +00:00
Lucas Lin
c93658141e [automerger skipped] Merge "Pull service dumps to help debug test failures." am: d8b6e3dfe8 am: f9b42ca13b -s ours am: a20c0fee65 -s ours am: 4216947af6 -s ours 
am skip reason: Change-Id I93317c201a0ea06732e29154ab7e140735381f59 with SHA-1 09ae6d2645 is in history

Change-Id: I261781f6cf9c594f16e61fb219c1cc7767f29860
 2020-04-22 04:05:29 +00:00
Lucas Lin
4216947af6 [automerger skipped] Merge "Pull service dumps to help debug test failures." am: d8b6e3dfe8 am: f9b42ca13b -s ours am: a20c0fee65 -s ours 
am skip reason: Change-Id I93317c201a0ea06732e29154ab7e140735381f59 with SHA-1 09ae6d2645 is in history

Change-Id: I79307e1bf2638848b9feefd2b66a21cab0f27be7
 2020-04-22 03:46:36 +00:00
Lucas Lin
a20c0fee65 [automerger skipped] Merge "Pull service dumps to help debug test failures." am: d8b6e3dfe8 am: f9b42ca13b -s ours 
am skip reason: Change-Id I93317c201a0ea06732e29154ab7e140735381f59 with SHA-1 09ae6d2645 is in history

Change-Id: I79a4c32a60c30db63b99430359247f5ea314f1b3
 2020-04-22 03:22:00 +00:00
Lucas Lin
f9b42ca13b Merge "Pull service dumps to help debug test failures." am: d8b6e3dfe8 
Change-Id: I1db74e2c46445e7d54cf6758f7c2aeaffbfd2447
 2020-04-22 03:06:31 +00:00
Sudheer Shanka
e3711ae317 Pull service dumps to help debug test failures. 
+ Convert tests to use Junit4
+ Add annotations to specify required conditions for the test to run.

Bug: 137859686
Test: atest hostsidetests/net/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Test: atest hostsidetests/net/src/com/android/cts/net/HostsideNetworkCallbackTests.java
Change-Id: I93317c201a0ea06732e29154ab7e140735381f59
Merged-In: I93317c201a0ea06732e29154ab7e140735381f59
 2020-04-21 14:29:19 +00:00
Remi NGUYEN VAN
e96bd02054 Fix test initialization errors on Q 
ConnectivityDiagnosticsManagerTest, MultinetworkApiTest,
NetworkAgentTest crashed before the runner could start them:
 - Ignore ConnectivityDiagnosticsManagerTest on Q: it tests an API that
   was introduced in R.
 - Build JNI libraries used by MultinetworkApiTest against the NDK to
   avoid errors loading the libraries on older platforms, when
   transitive dependencies have been added.
 - Do not attempt to override Handler#getLooper() (which is final) in
   NetworkAgentTest; it appears to have been overridden by accident by
   specifying "val looper" in the TestableNetworkAgent definition, which
   generates a getter.

Test: atest CtsNetTestCasesLatestSdk:ConnectivityDiagnosticsManagerTest
      atest CtsNetTestCasesLatestSdk:MultinetworkApiTest
      atest CtsNetTestCasesLatestSdk:NetworkAgentTest
Bug: 150918852
Merged-In: I262b54c6897ed755adaeb2b118c638320634f7a1
Change-Id: I262b54c6897ed755adaeb2b118c638320634f7a1
 2020-04-21 13:40:28 +00:00
Remi NGUYEN VAN
98089a8ef1 Merge "Fix test initialization errors on Q" am: 8b5e3031fa am: 2fcbc1b8ad am: 26e64df41a am: 8a1b79d28b am: 7e0e7139e0 
Change-Id: I49088b219ffccb28540877f477bc6472bbc46a06
 2020-04-21 13:22:31 +00:00
Remi NGUYEN VAN
7e0e7139e0 Merge "Fix test initialization errors on Q" am: 8b5e3031fa am: 2fcbc1b8ad am: 26e64df41a am: 8a1b79d28b 
Change-Id: Icdab599563849295d34b788682ce1d5730c4383f
 2020-04-21 13:08:29 +00:00