Commit Graph

498 Commits

Author SHA1 Message Date
Aaron Huang
3bde36484b Merge "Use real ProxyTracker in ConnectivityServiceTest" am: c7037475fa am: 4fc403c3b0 am: 1faca14f77
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1885529

Change-Id: I2f4a689aae9dafbad0bb5e3cd74f43a5c72fd898
2021-11-22 06:03:37 +00:00
Aaron Huang
4fc403c3b0 Merge "Use real ProxyTracker in ConnectivityServiceTest" am: c7037475fa
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1885529

Change-Id: Id685a51b37d59a822aaa9307f9d4b55053211612
2021-11-22 05:41:34 +00:00
Aaron Huang
c7037475fa Merge "Use real ProxyTracker in ConnectivityServiceTest" 2021-11-22 05:25:28 +00:00
Remi NGUYEN VAN
d1ed21007a Remove unused service and test dependencies am: f96ecf2708 am: e03f77170a am: 7d865f3e10
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1895317

Change-Id: I22260179985637d82e20b346786bed44148e5dc2
2021-11-19 16:27:47 +00:00
Remi NGUYEN VAN
e03f77170a Remove unused service and test dependencies am: f96ecf2708
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1895317

Change-Id: I677a6b4c0b68648b4fab0e6f67edc88aa8be77b2
2021-11-19 15:59:07 +00:00
Remi NGUYEN VAN
f96ecf2708 Remove unused service and test dependencies
Nothing uses StateMachine in service-connectivity, and
FrameworksNetTestsLib pulled a lot of unused dependencies with
services.core and services.net.

Remove unused dependencies. This helps measure code coverage more
accurately.

Bug: 207020032
Test: atest ConnectivityCoverageTests
Change-Id: I39857865594a3263c4b1deeda23312c8e4f86a77
2021-11-19 21:14:39 +09:00
Aaron Huang
e3879abb07 Use real ProxyTracker in ConnectivityServiceTest
Currently CS test uses a mock ProxyTracker object to verify that
the sendProxyBroadcast() is called. Also, if the network is a
default network then sendProxyBroadcast() will be indirectly
called in setDefaultProxy(). This only verifies that the method
is called but it doesn't verify that the broadcast is sent.

Instead of testing setDefaultProxy() is called, it is better to
verify that the broadcast is actually sent. Therefore, use a
real ProxyTracker in the test to verify the broadcast is sent.

Test: FrameworksNetTests:ConnectivityServiceTest
Change-Id: Id5c9e07e8326f24bd2665b4bb08f96d6d57d999c
2021-11-15 20:01:12 +08:00
Xin Li
e41bbea995 Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918
Bug: 205056467
Merged-In: I745ef4d42ecaf06bb81d9dbe0b7162267fea65a8
Change-Id: I7b2a1fc519124cfc10806dde5fd543504a51e072
2021-11-10 08:06:18 +00:00
Remi NGUYEN VAN
eb96b60f67 Don't rematch all requests when adding new ones am: 959d2cb6bd am: b92f209a18 am: 0cd2be4ab9 am: c32b4e9ef3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1784387

Change-Id: I83a8fffbc81531b64aa8d945e264ead373b9733a
2021-11-10 05:12:15 +00:00
Remi NGUYEN VAN
c32b4e9ef3 Don't rematch all requests when adding new ones am: 959d2cb6bd am: b92f209a18 am: 0cd2be4ab9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1784387

Change-Id: Ia87ab722412c3a534d70327595180338f1ff1cf3
2021-11-10 05:00:44 +00:00
Remi NGUYEN VAN
959d2cb6bd Don't rematch all requests when adding new ones
With the network selection rewrite in S, rematching a single request can
now easily be done; this can be used as an optimization in
handleRegisterNetworkRequests to avoid rematching all requests when
registering a new one.

This can be disabled by a flag that is unset by default,
REMATCH_ALL_REQUESTS_ON_REGISTER.

Test: atest ConnectivityServiceTest
Change-Id: If76f79b41ac88863974f7025624667134bea2570
2021-11-08 19:17:57 +09:00
Les Lee
31a09fa459 Merge "Add test case to test normalize" am: b5ee639fe0 am: 663dfcaec0 am: a02490446c am: 9381fb73df
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1881008

Change-Id: I102ccec75f219d389da5a100e28916bbcd4b0029
2021-11-06 01:58:02 +00:00
Les Lee
9381fb73df Merge "Add test case to test normalize" am: b5ee639fe0 am: 663dfcaec0 am: a02490446c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1881008

Change-Id: I5aa2cd09e100518d131a8df60beae0c7a581ba80
2021-11-06 01:47:37 +00:00
Les Lee
b5ee639fe0 Merge "Add test case to test normalize" 2021-11-06 00:54:14 +00:00
Les Lee
5299a2b307 Add test case to test normalize
Bug: 194939211
Test: atest -c NetworkTemplateTest
Change-Id: I2f5790b9217357ddcf3f466cec1b2b1afbb47210
2021-11-05 16:59:10 +08:00
Remi NGUYEN VAN
9a03682cd6 Merge "Move fromStableParcelable to KeepaliveController" am: 1d1b1fe999 am: ead12ae16a am: e07f913453 am: f0e3265adc
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1876687

Change-Id: I2a8ebb8d92d0972cf43282108e431226ebf60cc6
2021-11-04 07:19:18 +00:00
Remi NGUYEN VAN
f0e3265adc Merge "Move fromStableParcelable to KeepaliveController" am: 1d1b1fe999 am: ead12ae16a am: e07f913453
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1876687

Change-Id: I5c5d45a2ecb959edb2b0ff69b3fe2fd68f3dc81f
2021-11-04 07:01:17 +00:00
Remi NGUYEN VAN
1d1b1fe999 Merge "Move fromStableParcelable to KeepaliveController" 2021-11-04 06:19:17 +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
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
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
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
5d99aa78f7 Move fromStableParcelable to KeepaliveController
TcpKeepaliveController is the only user of
KeepalivePacketDataUtil.fromStableParcelable. Because of
fromStableParcelable, networkstack-client needs to depend on
net-utils-framework-commonm, which pulls a lot of unnecessary classes.
This is particularly problematic considering that networkstack-client
may need to be redistributed as a prebuilt.

Move the method to TcpKeepaliveController, simplifying dependencies.
This also shows that fromStableParcelable could be removed altogether
(or moved to tests) if TcpKeepaliveController built a
TcpKeepalivePacketData class directly.

Test: atest ConnectivityCoverageTests
Change-Id: I554318f6bcd07c73d153598a0231e9fcaf912e90
2021-11-01 13:23:27 +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
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
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
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
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
9c9850b944 Merge "Add underlying networks into NetworkAgentInfo if any" 2021-10-21 08:33:29 +00:00
Paul Hu
1adf69b418 Merge "Crash bad callers earlier" am: 7a30d04659 am: ad329392a7 am: c04b1e707f am: efca18d4cc
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1862335

Change-Id: Ifb8acb68fbfc964741e779fb245b153bfe55b315
2021-10-20 07:43:20 +00:00
Paul Hu
efca18d4cc Merge "Crash bad callers earlier" am: 7a30d04659 am: ad329392a7 am: c04b1e707f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1862335

Change-Id: I208aad86a1315e452f723eb1d130d9af2bbd5693
2021-10-20 07:32:12 +00:00
Chalard Jean
4b918ab1a4 Crash bad callers earlier
Instead of crashing when parceling the NetworkInfo object,
crash at the time the bad call is made.

Bug: 145972387
Test: FrameworksNetTests
Change-Id: If8b5fd3d7b800c97211bcd16c9a8c5812708d4ab
2021-10-19 16:43:50 +08:00
lucaslin
6adf5ac19b Add underlying networks into NetworkAgentInfo if any
Now, VPN will set underlying networks into NetworkCapabilities
directly. So the declaredUnderlyingNetworks can also be set
directly when creating a NetworkAgentInfo.

Bug: 191918368
Test: atest FrameworksNetTests:ConnectivityServiceTest
Change-Id: I507072d00ae1eb0c391e5261ab93e359b9c4cb5c
2021-10-19 15:04:56 +08:00
Aaron Huang
21b13bb81b 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.

Ignore-AOSP-First: There's a CL in the same topic will conflict
with internal tree so ignore AOSP first.
Bug: 183776809
Test: atest FrameworksNetTest
Change-Id: I859514b93705f9ee4f9ae4b0bcddcb61005a78ff
2021-10-07 17:28:33 +08:00
Aaron Huang
35bbf12886 Test a template matches mobile and mobile wildcard
Add two test cases for matchesMobile and matchesMobileWildcard

Bug: 183776809
Test: FrameworksNetTests:NetworkTemplateTest
Change-Id: I14d31071655204fe6ad36c71f7f521640e01c96e
Merged-In: I14d31071655204fe6ad36c71f7f521640e01c96e
2021-10-05 21:09:16 +08:00
Aaron Huang
ea0732e615 Remove ForceAllNetworkTypes from test
Before sForceAllNetworkTypes is removed, the network
type and meteredness will be ignored when matchesMobile
or matchesMobileWildcard is called.

After sForceAllNetworkTypes is removed, the matches
method should check the network type and the meteredness.
Thus, if the test data contains different type or it's
not metered should not be counted.

Bug: 183776809
Test: FrameworksNetTests
Change-Id: Ie7194495d26c0f5ef7a247733f43c64688626c67
Merged-In: Ie7194495d26c0f5ef7a247733f43c64688626c67
2021-10-05 21:08:57 +08:00