LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,646 Commits 2 Branches 0 Tags
3e07ceec22ae673234e20e1880ea97256ce1b5aa
Commit Graph

3869 Commits

Author SHA1 Message Date
Kimberly Kreider
4cb884ed08 Merge "Replace "mts" with "mts-tethering"." am: 200e42063c am: 57699090be am: 6219b5d007 am: 13589b1fa7 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1864894

Change-Id: I36127712e3784828d1efe2ec420a8f2b12d53cb7
 2021-11-02 00:45:52 +00:00
Kimberly Kreider
13589b1fa7 Merge "Replace "mts" with "mts-tethering"." am: 200e42063c am: 57699090be am: 6219b5d007 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1864894

Change-Id: If55632a6e27c543d991764fdb01af6c9ee624721
 2021-11-02 00:29:08 +00:00
Kimberly Kreider
6219b5d007 Merge "Replace "mts" with "mts-tethering"." am: 200e42063c am: 57699090be 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1864894

Change-Id: Ib2d1ff1400f37ab7cfcbbdaf3601cb3e52b1bb1e
 2021-11-02 00:18:08 +00:00
Kimberly Kreider
200e42063c Merge "Replace "mts" with "mts-tethering"." 2021-11-01 23:43:53 +00:00
Treehugger Robot
336615b169 Merge "Shorten a timeout" am: a200fe8c1c am: f4016713ae am: b65a52ae31 am: 6a1754e7cd 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1877219

Change-Id: I6495dedf7f44c104e97bb9ac34c49a1c71a40670
 2021-11-01 13:23:54 +00:00
Treehugger Robot
6a1754e7cd Merge "Shorten a timeout" am: a200fe8c1c am: f4016713ae am: b65a52ae31 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1877219

Change-Id: I438627f51aeebd18f05156d6a2f4c240dd3b26d3
 2021-11-01 13:07:18 +00:00
Treehugger Robot
b65a52ae31 Merge "Shorten a timeout" am: a200fe8c1c am: f4016713ae 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1877219

Change-Id: Iae749b9f2bc189ce41c7c0b4523db543469f515d
 2021-11-01 12:50:06 +00:00
Treehugger Robot
a200fe8c1c Merge "Shorten a timeout" 2021-11-01 12:19:28 +00:00
Chalard Jean
d2dd46f9a4 Merge "Replace mDeps with a custom object" am: 31ac212428 am: 0aa49aa970 am: aa6314e229 am: f5a4805020 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1868567

Change-Id: I464bb8d4b3018df9202a49a3640cb4dfbb95d618
 2021-11-01 11:17:17 +00:00
Chalard Jean
f5a4805020 Merge "Replace mDeps with a custom object" am: 31ac212428 am: 0aa49aa970 am: aa6314e229 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1868567

Change-Id: Ibf65d816f37d6e9912922cc789cefe70a4e660fd
 2021-11-01 11:08:19 +00:00
Chalard Jean
aa6314e229 Merge "Replace mDeps with a custom object" am: 31ac212428 am: 0aa49aa970 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1868567

Change-Id: I2f33da7376c4f788d6c6159710b26071247b5430
 2021-11-01 10:56:05 +00:00
Chalard Jean
31ac212428 Merge "Replace mDeps with a custom object" 2021-11-01 10:31:53 +00:00
Chalard Jean
f63e4597a3 Shorten a timeout 
This timeout is not very useful but will be incurred every
time

Test: ConnectivityServiceTest
Change-Id: Ia7c76c7c7a148f14844d098be267e16c215776f5
 2021-11-01 19:30:10 +09:00
Lucas Lin
2c6551923a Merge "Add tests for testing if [start|finish]Op is called or not" am: 5bf4cd9a73 am: 3e7abf056d am: a360f715df am: faa8cbf5bb 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1853600

Change-Id: Ie9739d2e4fa901ff235b6078a16dd967fcd82814
 2021-11-01 09:36:52 +00:00
Lucas Lin
faa8cbf5bb Merge "Add tests for testing if [start|finish]Op is called or not" am: 5bf4cd9a73 am: 3e7abf056d am: a360f715df 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1853600

Change-Id: I4a398ca7fb50e377c6ae8e6a4f999ac3940c228c
 2021-11-01 09:20:37 +00:00
Lucas Lin
a360f715df Merge "Add tests for testing if [start|finish]Op is called or not" am: 5bf4cd9a73 am: 3e7abf056d 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1853600

Change-Id: I286c855211e8b61af47b880973d79352b2fe9faf
 2021-11-01 09:02:07 +00:00
Lucas Lin
5bf4cd9a73 Merge "Add tests for testing if [start|finish]Op is called or not" 2021-11-01 08:33:36 +00:00
Chalard Jean
21f4f70d46 Replace mDeps with a custom object 
Mockito's mocks are not thread-safe. The dependencies object
is used both on the test thread (to set it up) and in the CS
handler thread. This can't work with a mock.

Bug: 195626111
Test: ConnectivityServiceTest
Change-Id: Ia989dd71c3133513a90bc1d1957419fb1b74c300
 2021-11-01 16:30:56 +09:00
Remi NGUYEN VAN
6c1c36eb0a Merge "Add RequiresDevice to relevant tests" am: 8e58917bc3 am: b4923dd4e5 am: 0b621e6700 am: c3e2191eef 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1872873

Change-Id: I633be4f92b2fa3a9e724ede0c4183849adf083cf
 2021-10-28 09:41:09 +00:00
Remi NGUYEN VAN
c3e2191eef Merge "Add RequiresDevice to relevant tests" am: 8e58917bc3 am: b4923dd4e5 am: 0b621e6700 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1872873

Change-Id: I07764753b51bfd6133512a480ed415dae1639cab
 2021-10-28 09:24:00 +00:00
Remi NGUYEN VAN
0b621e6700 Merge "Add RequiresDevice to relevant tests" am: 8e58917bc3 am: b4923dd4e5 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1872873

Change-Id: I7156824eae3b698e03a6e63e1b8d88d4ce37c7ef
 2021-10-28 09:06:08 +00:00
Remi NGUYEN VAN
9a689f81f4 Add RequiresDevice to relevant tests 
Replace SkipPresubmit with RequiresDevice on relevant tests, as
RequiresDevices is more standard and more specific.

This allows creating test configurations using virtual devices which are
not necessarily in presubmit.

Bug: 201014262
Test: TH needs to verify test mapping run with new annotation
Change-Id: I6758d2a41a9a987a5244e47e4795bc49889c4d61
 2021-10-28 09:49:42 +09:00
Aaron Huang
f6c60aedb0 Add a test for metered/non-metered mobile network am: 2685c929f4 am: bbb828ef8e am: 7bd953a52e am: 0ae456a03f 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1779527

Change-Id: Ia6a2c03e6201ba3f61f7f6dfc3576c57ccf88fa9
 2021-10-26 13:10:50 +00:00
Aaron Huang
b4e3a69b9d Add a test for NetworkIdentity.getMetered() am: eaca5b1982 am: 1d79f3dd99 am: 27282130c6 am: 8f74a5b35e 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1779526

Change-Id: Ied8673f9c86c04257296baeebfcfa76849244625
 2021-10-26 13:10:32 +00:00
Aaron Huang
0ae456a03f Add a test for metered/non-metered mobile network am: 2685c929f4 am: bbb828ef8e am: 7bd953a52e 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1779527

Change-Id: I0997a3d5e1e69c4cf8f3b1c53c8e46aa45f5ca21
 2021-10-26 12:57:58 +00:00
Aaron Huang
8f74a5b35e Add a test for NetworkIdentity.getMetered() am: eaca5b1982 am: 1d79f3dd99 am: 27282130c6 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1779526

Change-Id: I4267e508a39ceadf09f13e45d6a568dc1bac4600
 2021-10-26 12:57:49 +00:00
Aaron Huang
7bd953a52e Add a test for metered/non-metered mobile network am: 2685c929f4 am: bbb828ef8e 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1779527

Change-Id: I85d92030e2e41e6783896f888d96338120a7aec0
 2021-10-26 12:46:06 +00:00
Aaron Huang
27282130c6 Add a test for NetworkIdentity.getMetered() am: eaca5b1982 am: 1d79f3dd99 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1779526

Change-Id: I8b2eae1bf5fe67a76c7fe2837136abe0ad9abebd
 2021-10-26 12:45:49 +00:00
Aaron Huang
2685c929f4 Add a test for metered/non-metered mobile network 
NetworkTemplate.buildTemplateMobileWithRatType() supports
to build a template with metered filter, so a mobile network
is metered or non-metered should be tested.

This commit also rename buildMobile3gState to buildMobileState
because originally this method uses NetworkInfo to simulate the
network type. The NetworkInfo related codes were removed.
Currently, setMobileRatTypeAndWaitForIdle is used to simulate
the network type in test.

Ignore-AOSP-First: The parent of this change contains a CL will
conflict with internal tree so ignore AOSP first.
Bug: 183776809
Test: this
Change-Id: I8e54e2acb06db81fb0eaf330c4fd7cb391b01ff3
 2021-10-26 12:16:18 +00:00
Aaron Huang
eaca5b1982 Add a test for NetworkIdentity.getMetered() 
NetworkIdentity has adapted NET_CAPABILITY_TEMPORARILY_NOT_METERED
network capability so add a test case for it.

Ignore-AOSP-First: The parent of this change contains a CL will
conflict with internal tree so ignore AOSP first.
Bug: 183776809
Test: this
Change-Id: I2ca2a8b4db664b76a5a5ee82fcff451efd87c8ff
 2021-10-26 12:16:03 +00:00
Lucas Lin
160d975ce1 Merge changes Ib2d54e53,Ieb606d2b am: c5e61cc540 am: af97e30d9f am: bcc25755bf am: 01262555a9 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1829936

Change-Id: I563bbba3db26a9e5691159696c08141599b4dcae
 2021-10-26 06:55:42 +00:00
Lucas Lin
01262555a9 Merge changes Ib2d54e53,Ieb606d2b am: c5e61cc540 am: af97e30d9f am: bcc25755bf 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1829936

Change-Id: I6a74e1090f563ad756f7d8afb7a852dc9e7f78eb
 2021-10-26 06:41:24 +00:00
Aaron Huang
201e944eed Merge "Update callers to use buildTemplateMobileWithRatType with metered" am: c5655055a3 am: 386e1702a5 am: 64416e9b01 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1807404

Change-Id: I9750701efee19935fb4613cfe67bd9a419005374
 2021-10-26 06:41:13 +00:00
Lucas Lin
bcc25755bf Merge changes Ib2d54e53,Ieb606d2b am: c5e61cc540 am: af97e30d9f 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1829936

Change-Id: Icf7d82373618decfc9823cf0bffbd38bf03a94a2
 2021-10-26 06:24:12 +00:00
Aaron Huang
64416e9b01 Merge "Update callers to use buildTemplateMobileWithRatType with metered" am: c5655055a3 am: 386e1702a5 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1807404

Change-Id: I64acda4d4db9511049ef72ea67001a0c833035df
 2021-10-26 06:24:07 +00:00
Lucas Lin
c5e61cc540 Merge changes Ib2d54e53,Ieb606d2b 
* changes:
  Test if underlying networks are the same as what VpnService sets
  Convert VpnTest to JUnit4
 2021-10-26 06:07:19 +00:00
lucaslin
cacd5b0d2a Test if underlying networks are the same as what VpnService sets 
If VpnService set null as the underlying networks, then the
underlying networks will be set as system defeult network.
If VpnService set an empty array as the underlying networks, then
the underlying networks of VPN will not be set to any networks.
If VpnService set a network which is not null or an empty array,
then the underlying networks of VPN should be the same as this
one.

Bug: 191918368
Test: atest CtsHostsideNetworkTests:HostsideVpnTests
Change-Id: Ib2d54e53960e5f899cb8d4cfaa6705ca676354ca
 2021-10-26 10:55:41 +08:00
lucaslin
d2de904def Convert VpnTest to JUnit4 
This is to fix the error in errorprone target, the error message
is: [JUnit4ClassUsedInJUnit3] Assume cannot be used inside a
JUnit3 class. Convert your class to JUnit4 style.
The error method is: assumeTrue()

Bug: 191918368
Test: atest CtsHostsideNetworkTests:HostsideVpnTests
Change-Id: Ieb606d2ba31cc19510425114c76fd77417227f2c
 2021-10-26 10:55:25 +08:00
lucaslin
d4e7b00b2b Add tests for testing if [start|finish]Op is called or not 
Add a test for testing if [start|finish]Op will be called when
[start|stop]VpnProfile is called.
Also add a test to ensure that the startOp will not be called
again when seamless handover is happened.

Bug: 197135981
Test: atest FrameworksNetTests:VpnTest
Change-Id: I778ea4edf7c4a2d20b3b8e1877e7942feac5372a
 2021-10-26 03:46:46 +08:00
Aaron Huang
56d5a2cc35 Merge "Update callers to use buildTemplateMobileWithRatType with metered" into sc-v2-dev am: 25f4b66ced 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15938077

Change-Id: I7dbafb7462badb4291f2f06e8d8b44d8308608ee
 2021-10-25 15:26:02 +00:00
Aaron Huang
6359ebd099 Update callers to use buildTemplateMobileWithRatType with metered 
The method buildTemplateMobileWithRatType is updated to take
metered as a parameter so the callers should be updated to
the new version.

Bug: 183776809
Test: atest FrameworksNetTest
Change-Id: I859514b93705f9ee4f9ae4b0bcddcb61005a78ff
Merged-In: I859514b93705f9ee4f9ae4b0bcddcb61005a78ff
 2021-10-25 15:22:59 +00:00
Aaron Huang
25f4b66ced Merge "Update callers to use buildTemplateMobileWithRatType with metered" into sc-v2-dev 2021-10-25 15:09:01 +00:00
Chalard Jean
1b0915c261 Merge changes from topic "rm-forceAllNetworkTypes-sc-v2-dev" into sc-v2-dev 
* changes:
  Test a template matches mobile and mobile wildcard
  Remove ForceAllNetworkTypes from test
 2021-10-25 04:50:31 +00:00
Lucas Lin
19646da216 Merge "Wait for network to be validated when setting a valid private DNS" am: acd3e2be33 am: 58f526a27b am: de8bb78107 am: acc2824b10 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1801947

Change-Id: I35dd39ea64a0d5b4ab461ee270b11d27fcc53ecc
 2021-10-21 12:36:37 +00:00
Lucas Lin
acc2824b10 Merge "Wait for network to be validated when setting a valid private DNS" am: acd3e2be33 am: 58f526a27b am: de8bb78107 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1801947

Change-Id: I687380add7b5db73cc263876ed8df6f3f12499b2
 2021-10-21 12:24:06 +00:00
Lucas Lin
de8bb78107 Merge "Wait for network to be validated when setting a valid private DNS" am: acd3e2be33 am: 58f526a27b 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1801947

Change-Id: I04ae2dab4780b377df16fe0ce443b428a1a7722b
 2021-10-21 12:03:34 +00:00
Lucas Lin
acd3e2be33 Merge "Wait for network to be validated when setting a valid private DNS" 2021-10-21 11:34:35 +00:00
Lucas Lin
e15e075489 Merge "Add underlying networks into NetworkAgentInfo if any" am: 9c9850b944 am: 6f824bad06 am: 00e4e8579b am: ad068bd3c8 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1829935

Change-Id: I9a12e6d10611b0f5dace2ed1896bcc8738213699
 2021-10-21 10:32:40 +00:00
Lucas Lin
ad068bd3c8 Merge "Add underlying networks into NetworkAgentInfo if any" am: 9c9850b944 am: 6f824bad06 am: 00e4e8579b 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1829935

Change-Id: I2ca963ea3b9196302ab31fe1b4972492af85b19d
 2021-10-21 10:18:29 +00:00
Lucas Lin
00e4e8579b Merge "Add underlying networks into NetworkAgentInfo if any" am: 9c9850b944 am: 6f824bad06 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1829935

Change-Id: Ie98aeab553dd7e43e992d5a651624be9cedc637f
 2021-10-21 10:04:03 +00:00