Commit Graph

2996 Commits

Author SHA1 Message Date
Junyu Lai
6efa057bf5 Merge "Check null NetworkSpecifier before redacting" am: 435c4f7fc5 am: 9c5e87388d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1747893

Change-Id: I7e317ebb77d921c50e21a6a710e388e453cdfe62
2021-06-25 15:54:20 +00:00
Junyu Lai
435c4f7fc5 Merge "Check null NetworkSpecifier before redacting" 2021-06-25 15:27:55 +00:00
vichang
637b44ffed Merge "Remove usage of internal APIs from InetAddress and ServerSocket" am: c577c271ba am: 530af4bc13
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1737102

Change-Id: I6a617ff3c6e8dbbe49459a12169ce42a85f801e3
2021-06-25 11:17:20 +00:00
vichang
c577c271ba Merge "Remove usage of internal APIs from InetAddress and ServerSocket" 2021-06-25 10:54:52 +00:00
Junyu Lai
144b6c742a Check null NetworkSpecifier before redacting
Do null check before redacting, since NetworkSpecifier will not
always be attached. For example, NetworkSpecifier of wifi
network is only attached when a wifi network is created
in response to a network request with specifier attached.

Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest#testGetAllNetworkStateSnapshots \
      --rerun-until-failure 100
      (tested on cuttlefish mobile and wifi)
Bug: 191944987
Change-Id: I5df3547995111fe6340facb94a577296d2228694
2021-06-25 08:24:12 +00:00
Remi NGUYEN VAN
1e832f336b Merge "Skip connectivity unit tests before S" am: ef34fd2e21 am: 7ab2d7440c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1736507

Change-Id: I8f1d639243617f21ab220685108adab2a3e8d3a3
2021-06-25 06:07:10 +00:00
Remi NGUYEN VAN
05dd1ba540 Skip connectivity unit tests before S
The tests are packaged together with other tests in a common coverage
suite, so need to be individually annotated so that they are skipped
before S.

They do not need to pass on platforms older than S, because such
platforms will not updated with the code that is tested.

Bug: 187935317
Test: atest ConnectivityCoverageTests on R
Change-Id: I10da45ae023e7f1e8cd11ec857b84346892a3fa8
2021-06-25 10:10:12 +09:00
Junyu Lai
d4c644cf4d Merge changes Ib8637100,I33612650
* changes:
  Make yield-to-bad-wifi behavior backward compatible with R
  Add more unit tests for ConnectivityManager S APIs
2021-06-24 08:13:46 +00:00
Remi NGUYEN VAN
105b983c83 Merge "Add ConnectivityCoverageTests to postsubmit" am: 09d3a75357 am: 36ef90effc
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1736506

Change-Id: I03ee6f85d23b0c4a10ce4da432144b614c4d57dc
2021-06-24 07:02:25 +00:00
Remi NGUYEN VAN
09d3a75357 Merge "Add ConnectivityCoverageTests to postsubmit" 2021-06-24 06:32:36 +00:00
Chalard Jean
6b2f09272c Make yield-to-bad-wifi behavior backward compatible with R
Yielding cell wins to exiting wifi (whether good or bad).
It loses to bad wifi that's not exiting.

In R, yielding to bad wifi only affects wifis that are
unvalidated, but a wifi that is exiting should still be
dropped in favor of a cell that yields to bad wifi.

I had misunderstood the policy and implemented it wrong.
Now it's implemented right, and has careful tests.

Test: new tests for this
Bug: 186458024
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Merged-In: Ib8637100d491e72a2edb837584ce55b7dda58524
Change-Id: Ib8637100d491e72a2edb837584ce55b7dda58524
  (cherry-picked from ag/14486203)
2021-06-24 03:33:05 +00:00
Junyu Lai
92c29c56d7 Add more unit tests for ConnectivityManager S APIs
Test: atest android.net.ConnectivityManagerTest
Bug: 188657173
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Merged-In: I33612650eb89486a14fcfc440ba0c357f4bb513c
Change-Id: I33612650eb89486a14fcfc440ba0c357f4bb513c
  (cherry-picked from ag/14640282)
2021-06-24 03:20:39 +00:00
Lorenzo Colitti
f830039f69 Merge "Add CTS for BatteryStatsManager new API" am: 7325c86c26 am: f6a5b59f5a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722770

Change-Id: Ib9b0f4ae0b94163727c4c52b7f9ba852db43ffd6
2021-06-24 02:57:32 +00:00
Lorenzo Colitti
7325c86c26 Merge "Add CTS for BatteryStatsManager new API" 2021-06-24 02:26:53 +00:00
Aaron Huang
f52a30b605 Add CTS for BatteryStatsManager new API
Bug: 189308158
Test: This test and
      run testReportNetworkInterfaceForTransports
      with --rerun-until-failure 500
Change-Id: I654b8920d6ea1dada782a618776b13870f7f98df
2021-06-24 07:19:33 +08:00
Paul Hu
859611dfa4 Merge "Add test for CSM#[get|set]UidsAllowedOnRestrictedNetworks" am: 33b4929cfe am: 33ebb2d0af
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1740740

Change-Id: I703b9839f0e2e59c57e03bd2dfc31f1932f8c02c
2021-06-23 17:08:41 +00:00
Paul Hu
33b4929cfe Merge "Add test for CSM#[get|set]UidsAllowedOnRestrictedNetworks" 2021-06-23 16:30:57 +00:00
Chiachang Wang
ef570996db Merge "Add test for CM#setAvoidUnvalidated" am: 13549792e2 am: eaf5893102
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1733789

Change-Id: Ibf57a8fe0f49763b2bf1f7fe06c42851dde905cf
2021-06-23 09:51:28 +00:00
Chiachang Wang
13549792e2 Merge "Add test for CM#setAvoidUnvalidated" 2021-06-23 09:19:51 +00:00
Remi NGUYEN VAN
8b23feb10e Add ConnectivityCoverageTests to postsubmit
Add the tests to both postsubmit and mainline-postsubmit.

This should allow moving the tests to presubmit in the near future,
after they have been verified to pass in postsubmit.

Bug: 187935317
Test: treehugger needs to test
Change-Id: I9a05d6a300c5f777497e867d0456bc59b06eee80
2021-06-23 18:02:22 +09:00
paulhu
d266285172 Add test for CSM#[get|set]UidsAllowedOnRestrictedNetworks
Bug: 185149952
Test: atest ConnectivityManagerTest
Change-Id: Ie9391d9332ded58cf1e63c8c5c6f5ba85c950bc6
2021-06-23 08:01:00 +00:00
Remi NGUYEN VAN
2b2df6c85b Merge "Added tests for QosCallback" am: 8ce48fe117 am: f4a7d4130f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1558648

Change-Id: Ic1e274100986681ac7d203ae6ad424387903e2a2
2021-06-23 06:30:09 +00:00
Remi NGUYEN VAN
2370c7cdf4 Merge "Add basic tests for InvalidPacketException" am: eb0a4b41f8 am: b1eee18493
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1742076

Change-Id: Ia8e3933f3abe69565e1b3e91fa38fff6ce0d36c5
2021-06-23 06:30:05 +00:00
Luke Huang
226281b698 Merge "Fix the comments from aosp/1719018" am: 0c20c4901f am: 9adee2f105
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729691

Change-Id: I65dd02aacd50acb92d15c76457f8415b0cc8b73e
2021-06-23 06:29:30 +00:00
Chiachang Wang
481040b43a Add test for CM#setAvoidUnvalidated
Bug: 186061922
Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest
Test: atest CtsNetTestCasesLatestSdk
Change-Id: I77dc5556458c2e824f7abd5a7b79e8aeed8dabf3
2021-06-23 13:54:04 +08:00
Remi NGUYEN VAN
8ce48fe117 Merge "Added tests for QosCallback" 2021-06-23 05:34:46 +00:00
Remi NGUYEN VAN
eb0a4b41f8 Merge "Add basic tests for InvalidPacketException" 2021-06-23 05:32:52 +00:00
Luke Huang
0c20c4901f Merge "Fix the comments from aosp/1719018" 2021-06-23 03:36:02 +00:00
Remi NGUYEN VAN
5b20059b56 Merge "Move ConnectivityDiagnosticsManagerTest to common" am: ef21082033 am: cb88733c59
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1742075

Change-Id: I5a0959b0dacbed1662a7852ad8d191cfa57c57e4
2021-06-23 03:11:12 +00:00
Remi NGUYEN VAN
bf44f6200e Add basic tests for InvalidPacketException
The test simply verify the constructor. They only apply on S+ as
InvalidPacketException is not updatable before S.

Bug: 187935317
Test: atest InvalidPacketExceptionTest
Change-Id: I33f1ee1702672204a46063e6e75c3880d5e7600b
2021-06-23 11:33:10 +09:00
Remi NGUYEN VAN
ef21082033 Merge "Move ConnectivityDiagnosticsManagerTest to common" 2021-06-23 02:31:03 +00:00
Frank Li
23ccaddf1b Merge "Ignore some ConnectivityManagerTest CTS tests that can't be run in the instant app mode" am: a8a7cfd668 am: c4b4635f20
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1743373

Change-Id: Id65f442158f67d149bdc14ef7a00cd56db606c9f
2021-06-23 02:08:53 +00:00
Paul Hu
977a013d10 Merge "Add ConnectivitySettingsManagerTest" am: 6160d60b2e am: f37dd31334
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1738353

Change-Id: I239c14543f6948cb729424008054317b28bb9647
2021-06-23 02:08:49 +00:00
Chiachang Wang
403836f671 Merge "Provide a way to override the avoid bad wifi configuration" am: 38e8c2c94b am: 4ef85d615b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1733788

Change-Id: Ibe05bc988f0020eec8485023c3529bcc1696bd80
2021-06-23 02:08:44 +00:00
Remi NGUYEN VAN
4b348711de Merge "Add tests for duplicate PendingIntent requests" am: 307cb41ade am: 98138948fe
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1742073

Change-Id: I0246e733e7a33bc4958ebb25948032f3669d1c33
2021-06-23 02:08:35 +00:00
Frank Li
a8a7cfd668 Merge "Ignore some ConnectivityManagerTest CTS tests that can't be run in the instant app mode" 2021-06-23 01:58:59 +00:00
Paul Hu
6160d60b2e Merge "Add ConnectivitySettingsManagerTest" 2021-06-23 01:36:16 +00:00
Remi NGUYEN VAN
6214f82c04 Added tests for QosCallback
Tests for the newly added QosCallback functionality

Bug: 155176305
Test: Added to cts/NetworkAgentTest
Change-Id: I29769fc8be074a5105bfe4ac34e30980c5f8744a
2021-06-23 09:51:14 +09:00
Chiachang Wang
38e8c2c94b Merge "Provide a way to override the avoid bad wifi configuration" 2021-06-23 00:48:17 +00:00
Remi NGUYEN VAN
307cb41ade Merge "Add tests for duplicate PendingIntent requests" 2021-06-22 23:35:42 +00:00
Yan Yan
b205411479 Merge "Test updating underlying network of IpSecTunnelInterface" am: 010ec2cddd am: 0783fed2ba
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1488296

Change-Id: I269747f4c2e575d8afb89fcc7685d9fab6d49c31
2021-06-22 17:59:12 +00:00
Yan Yan
010ec2cddd Merge "Test updating underlying network of IpSecTunnelInterface" 2021-06-22 17:27:11 +00:00
lifr
279a8ee8f7 Ignore some ConnectivityManagerTest CTS tests that can't be run in the instant app mode
1. testIsPrivateDnsBroken: It requires the
   permission:android.permission.WRITE_SECURE_SETTINGS. But the
   WRITE_SECURE_SETTINGS permission can't be granted to instant
   apps.
2. testSetOemNetworkPreferenceForTestOnlyPref: Instant apps can't
   create test networks.
3. testSetOemNetworkPreferenceForTestPref: Instant apps can't
   create test networks.

Bug: 191678254
Bug: 191680108
Test: atest android.net.cts.ConnectivityManagerTest --instant
      atest CtsNetTestCasesLatestSdk:ConnectivityManagerTest --instant
Change-Id: Ice43bcf7a1dc34f4a54fefba7f408767f0a4341e
2021-06-23 00:49:25 +08:00
Remi NGUYEN VAN
489275e84e Add tests for duplicate PendingIntent requests
Add tests for requestNetwork and registerNetworkCallback with
PendingIntents that are equal as per PendingIntent.intentFilterEquals.

In such situations, the first request is documented to be automatically
unregistered. This means that the PendingIntent should only be fired
once, instead of being fired for both requests.

Currently this behavior is broken for network callbacks (not for network
requests).

Test: atest ConnectivityManagerTest
Bug: 174237997
Change-Id: Ic636c731c71474ef09043d7a26ccfd6e2bb5c39f
2021-06-22 18:24:52 +09:00
Chiachang Wang
6eac9fb787 Provide a way to override the avoid bad wifi configuration
ConnectivityManager.setAvoidUnvalidated only works if the
config_networkAvoidBadWifi configuration is set to 0 and the
NETWORK_AVOID_BAD_WIFI setting is unset. There is no easy way
for a testing app to temporary set a test value to verify the
behavior of the API. Thus, add a mechanism to allow test app
to set a period of time to temporary unstrict the resource
configuration, i.e. Temporary simulate config_networkAvoidBadWifi
configured to 0.

Bug: 186061922
Test: atest CtsNetTestCases FrameworksNetTests
Change-Id: If772078c61a9b12926f104d5dfc9c9071e844732
2021-06-22 14:54:02 +08:00
Paul Hu
e203a29272 Merge "Add test for CSM#[get|set]MobileDataPreferredUids" am: 5440e0b8e8 am: 732ab7557c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1736504

Change-Id: I0176debea776e1ed6473cc52d44160576665db2b
2021-06-22 03:48:10 +00:00
Lucas Lin
3345e0d602 Merge "Add CTS for isUidNetworkingBlocked & isUidRestrictedOnMeteredNetworks" am: 3f565a44b0 am: d7e6b4dfa9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1737395

Change-Id: Ib1a9a845b14883e651398deb1a6f35081c551783
2021-06-22 03:47:36 +00:00
paulhu
236a992cd0 Add ConnectivitySettingsManagerTest
- Add tests for ConnectivitySettingsManager.
- Also address leftover javadoc comments.

Bug: 182538166
Test: atest FrameworksNetTests
Test: atest CtsNetTestCases
Change-Id: I8161c1bca84b41964578d59ee5d6ab07b2380707
2021-06-22 03:00:51 +00:00
Paul Hu
5440e0b8e8 Merge "Add test for CSM#[get|set]MobileDataPreferredUids" 2021-06-22 01:33:49 +00:00
Lucas Lin
da9c2fb600 Merge "Use assertEquals instead of assertTrue to compare the vpn type" am: 56055496f3 am: 9ca145bcfa
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1739093

Change-Id: Idb987331163fde7019febdcbf3e28bf205894d37
2021-06-22 00:02:15 +00:00