Commit Graph

45622 Commits

Author SHA1 Message Date
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
0aa49aa970 Merge "Replace mDeps with a custom object" am: 31ac212428
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1868567

Change-Id: I3aaea000117e45aa9ff12b408231eae6c52a93cd
2021-11-01 10:43:44 +00:00
Chalard Jean
31ac212428 Merge "Replace mDeps with a custom object" 2021-11-01 10:31:53 +00: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
Mark Chien
d40de8277e Merge "Log received wifiP2p intent into dumpsys for debugging" am: 3a5c822ec1 am: 67a3201eb7 am: 4a4c6ae01b am: 74806ca71b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1873891

Change-Id: I6d873cc70edf7e0e023a5bb0c016a5013988b7ef
2021-11-01 08:59:21 +00:00
Mark Chien
74806ca71b Merge "Log received wifiP2p intent into dumpsys for debugging" am: 3a5c822ec1 am: 67a3201eb7 am: 4a4c6ae01b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1873891

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

Change-Id: Ifa83aca8d550948efd5e4795ca838580b1f9b8b3
2021-11-01 08:46:44 +00:00
Mark Chien
4a4c6ae01b Merge "Log received wifiP2p intent into dumpsys for debugging" am: 3a5c822ec1 am: 67a3201eb7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1873891

Change-Id: I313243ac391cb0691e3fda7041a77c44a740ffdb
2021-11-01 08:37:37 +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
Mark Chien
67a3201eb7 Merge "Log received wifiP2p intent into dumpsys for debugging" am: 3a5c822ec1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1873891

Change-Id: Icfda99fdbd0544b64733b2865163ce5af86f097f
2021-11-01 08:20:54 +00:00
Mark Chien
3a5c822ec1 Merge "Log received wifiP2p intent into dumpsys for debugging" 2021-11-01 08:04:55 +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
Chalard Jean
462c5ae371 Move to f/l/n instead of RouteUtils am: adcec9ebbe am: d988d2c778 am: d21d556e50 am: 903b5df857
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1873892

Change-Id: I34c4985fc5b01358bda13409ad1d3a15fba85101
2021-10-29 12:45:59 +00:00
Chalard Jean
903b5df857 Move to f/l/n instead of RouteUtils am: adcec9ebbe am: d988d2c778 am: d21d556e50
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1873892

Change-Id: I91013655b68313b2475c54e9f9365876222ffa69
2021-10-29 12:36:07 +00:00
Chalard Jean
d21d556e50 Move to f/l/n instead of RouteUtils am: adcec9ebbe am: d988d2c778
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1873892

Change-Id: I24508490d2fca07882c8990ccbc2345e00b58d9b
2021-10-29 12:18:30 +00:00
Chalard Jean
d988d2c778 Move to f/l/n instead of RouteUtils am: adcec9ebbe
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1873892

Change-Id: I79801cb08d450eb671af7dc269a0476180c0deaa
2021-10-29 12:00:56 +00:00
Chalard Jean
adcec9ebbe Move to f/l/n instead of RouteUtils
Test: TetheringTests
Change-Id: I35b36538463a7fc2f02e142719c898d1694b2d6b
2021-10-29 16:05:46 +09:00
markchien
eb8599c4e3 Log received wifiP2p intent into dumpsys for debugging
Bug: 201480425
Test: m
Change-Id: I527c894eff3c068080995333ab8b372ab2aa38a0
2021-10-29 14:45:14 +08:00
Treehugger Robot
6b4d4bbfb5 Merge "Improve logs in checkNrisConsistency" am: f58a955b37 am: 9b540a80b4 am: e278e7e049 am: 05d1bc114b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1872875

Change-Id: I6e53180dd0d11a04ab0d2535f1254d04543c49aa
2021-10-28 20:11:37 +00:00
Treehugger Robot
05d1bc114b Merge "Improve logs in checkNrisConsistency" am: f58a955b37 am: 9b540a80b4 am: e278e7e049
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1872875

Change-Id: I04d442b9975ea2ee91d12f33ee3a78a52763ecf7
2021-10-28 20:00:34 +00:00
Treehugger Robot
e278e7e049 Merge "Improve logs in checkNrisConsistency" am: f58a955b37 am: 9b540a80b4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1872875

Change-Id: I7568adefd07a2c6324f26d7e28d442f03a34537f
2021-10-28 19:42:17 +00:00
Treehugger Robot
9b540a80b4 Merge "Improve logs in checkNrisConsistency" am: f58a955b37
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1872875

Change-Id: If7cb572f01551606024c2dbd3e77cb967f5d9ed6
2021-10-28 19:30:47 +00:00
Treehugger Robot
f58a955b37 Merge "Improve logs in checkNrisConsistency" 2021-10-28 19:09:27 +00: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
b4923dd4e5 Merge "Add RequiresDevice to relevant tests" am: 8e58917bc3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1872873

Change-Id: I024ce824e37d00dea22b607119d87a875759619d
2021-10-28 08:48:32 +00:00
Remi NGUYEN VAN
8e58917bc3 Merge "Add RequiresDevice to relevant tests" 2021-10-28 08:30:44 +00:00
Chalard Jean
b39698eb37 Merge "Apply a workaround, and try to detect a system crash" am: 65571769cd am: 750ec86110 am: 96adc27ba4 am: cdc14d341b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1868846

Change-Id: Ie485c2700c99031be123096ee905986b4855e1da
2021-10-28 04:46:08 +00:00
Chalard Jean
cdc14d341b Merge "Apply a workaround, and try to detect a system crash" am: 65571769cd am: 750ec86110 am: 96adc27ba4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1868846

Change-Id: I43f31682afb2b1eda76cfad2eebb0a9d9a69ffdf
2021-10-28 04:32:58 +00:00
Chalard Jean
96adc27ba4 Merge "Apply a workaround, and try to detect a system crash" am: 65571769cd am: 750ec86110
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1868846

Change-Id: Idff1d1d678b5ee34867d8addf94f3bf1815d0cb3
2021-10-28 04:15:41 +00:00
Chalard Jean
750ec86110 Merge "Apply a workaround, and try to detect a system crash" am: 65571769cd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1868846

Change-Id: I0fc4d9408438fa5d0da810ae710e6c92d821b8a5
2021-10-28 03:57:53 +00:00
Chalard Jean
65571769cd Merge "Apply a workaround, and try to detect a system crash" 2021-10-28 03:46:28 +00:00
Chalard Jean
ba551d4dbb Improve logs in checkNrisConsistency
Test: ConnectivityServiceTest
Change-Id: If5235443217ad4abbdd40e89d5721d4f7832d52f
2021-10-28 12:45:12 +09: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
Chalard Jean
524f0b1d7f Apply a workaround, and try to detect a system crash
This will prevent the system crash in b/194394697, and on T try to
detect the issue much earlier and crash the system at that time
together with much more expansive logs.

Bug: 194394697
Test: ConnectivityServiceTest
Change-Id: Ia4be82179160216d41bf4d88b896e4814385063a
2021-10-27 16:00:56 +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
bbb828ef8e Add a test for metered/non-metered mobile network am: 2685c929f4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1779527

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

Change-Id: Ia958a25ef14d416dbdf8e26f18c6ab2b785105dd
2021-10-26 12:29:50 +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