Commit Graph

43015 Commits

Author SHA1 Message Date
Chiachang Wang
97fa4cc109 Merge "Correct the calling method in removeDefaultNetworkActiveListener" am: a6e3069c27 am: 7c04a51a95
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1827914

Change-Id: I7dfc06f15683c4e4502636cc0eab1285d1e6ee02
2021-09-16 06:50:32 +00:00
Chiachang Wang
7c04a51a95 Merge "Correct the calling method in removeDefaultNetworkActiveListener" am: a6e3069c27
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1827914

Change-Id: I69a199d8253aca744a43b04e89a88da65f6bd8b9
2021-09-16 06:39:32 +00:00
Chiachang Wang
a6e3069c27 Merge "Correct the calling method in removeDefaultNetworkActiveListener" 2021-09-16 06:29:36 +00:00
Chiachang Wang
e54c8199aa Correct the calling method in removeDefaultNetworkActiveListener
The removeDefaultNetworkActiveListener should do the
unregisteration but it's incorrectly calling
registerNetworkActivityListener into the ConnectivityService.

Bug: 199753782
Test: atest FrameworksNetTests CtsNetTestCases
Change-Id: I65a2ddc82989d736316d51f5058e707f5b261a82
2021-09-16 02:25:48 +00:00
markchien
0b21a5c104 Test QosSocketInfo.getNetwork am: 059bfa6149 am: 3e14f7df9f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1826063

Change-Id: I7c348c5524e3c2c003d9b166b4f5872f458fa213
2021-09-15 11:33:23 +00:00
markchien
3e14f7df9f Test QosSocketInfo.getNetwork am: 059bfa6149
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1826063

Change-Id: I29e01f008d6dfeb516dc71f7c3cf4637828b2b6c
2021-09-15 11:19:50 +00:00
markchien
059bfa6149 Test QosSocketInfo.getNetwork
Bug: 183239152
Test: atest NetworkAgentTest
Change-Id: I9848608e0aa500ff7668350a080537dd4a549214
2021-09-15 03:09:26 +00:00
Treehugger Robot
c25331f111 Merge "Add logging on UnfinishedStubbingException" am: f2ddb4151c am: e41baf1752
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1805818

Change-Id: I612f1e6631ca2a8193ae32d2079128ca3d726f9c
2021-09-13 02:58:02 +00:00
Treehugger Robot
e41baf1752 Merge "Add logging on UnfinishedStubbingException" am: f2ddb4151c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1805818

Change-Id: Id8aa8e2c460891500b2926b0585edd0bfd972fa9
2021-09-13 02:46:35 +00:00
Treehugger Robot
f2ddb4151c Merge "Add logging on UnfinishedStubbingException" 2021-09-13 02:34:27 +00:00
Bill Yi
1dcc8f8ab2 Merge changes from topic "presubmit-am-647350e3bf134d7da0e8df1bfb2dc418" into sc-dev-plus-aosp
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 069a442dc2
  Import translations. DO NOT MERGE ANYWHERE
2021-09-12 13:03:49 +00:00
Paul Hu
31f4fd40b0 Merge "Remove NetworkUtils.queryUserAccess in test" am: c7d5ea0bbd am: acffb5cc5a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1775930

Change-Id: I9543ed320b47fa38558dfe9ab3f1bbaebfba59d1
2021-09-11 06:36:55 +00:00
Paul Hu
acffb5cc5a Merge "Remove NetworkUtils.queryUserAccess in test" am: c7d5ea0bbd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1775930

Change-Id: Id19cdd1a8ff7dfb4093ca09b4397619097310dc4
2021-09-11 06:11:55 +00:00
Paul Hu
c7d5ea0bbd Merge "Remove NetworkUtils.queryUserAccess in test" 2021-09-11 05:56:45 +00:00
Bill Yi
826d98b7fa [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 069a442dc2
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15806632

Change-Id: I64943c434ce685f98917be1c42dc2b8b02e2aead
2021-09-10 22:25:04 +00:00
Bill Yi
069a442dc2 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I5d6853625026f0eb4f19bf414fdab18c5cfc4a05
2021-09-10 22:24:52 +00:00
Sergey Troshin
52fb8c8a8a Delete AirplaneModeTest am: 2e0b45004c am: 0e4b401e69
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1752425

Change-Id: I282879e9c46f36bb4ade1363be6c8a0a3fdfd979
2021-09-10 13:58:06 +00:00
Sergey Troshin
0e4b401e69 Delete AirplaneModeTest am: 2e0b45004c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1752425

Change-Id: I5038f3033261190c8e9d799fc115dfdb65e628bc
2021-09-10 13:43:09 +00:00
Sergey Troshin
2e0b45004c Delete AirplaneModeTest
It is flaky and redundant, functionality is covered in
ConnectivityManagerTest

Bug: 191856806
Test: N/A
Change-Id: I786f69f6f6cfb73e99cc5dea867024007f44d134
2021-09-10 09:17:39 +00:00
TreeHugger Robot
22e2abfd16 Merge "Add back tethering to TEST_MAPPING" into stage-aosp-master am: 74f74987bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15743502

Change-Id: Idff15894fb456e6b49d5db33555c776f4a10618b
2021-09-10 07:55:31 +00:00
TreeHugger Robot
74f74987bc Merge "Add back tethering to TEST_MAPPING" into stage-aosp-master 2021-09-10 07:35:27 +00:00
Treehugger Robot
11efc29041 Merge "Wait for validation of WiFi in OEM pref test" am: c60c1bc24e am: e6becb6820
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1821292

Change-Id: Ida29e5eaa577745ca5fff211177bc64c61059fc5
2021-09-09 19:30:12 +00:00
Treehugger Robot
e6becb6820 Merge "Wait for validation of WiFi in OEM pref test" am: c60c1bc24e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1821292

Change-Id: I7c26bb8a04b6c56257ef8ecb44a4afa50826a85e
2021-09-09 19:17:54 +00:00
Treehugger Robot
c60c1bc24e Merge "Wait for validation of WiFi in OEM pref test" 2021-09-09 18:51:32 +00:00
Junyu Lai
357868ed59 Merge "Include suspended network when getAllNetworkStateSnapshots" am: 48426bb2a4 am: 6f988d4042
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1797867

Change-Id: I1f37cccfd21d4905c886bbf8826fc7af9a51dafb
2021-09-09 09:55:54 +00:00
Junyu Lai
6f988d4042 Merge "Include suspended network when getAllNetworkStateSnapshots" am: 48426bb2a4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1797867

Change-Id: I700e16334e0f8aeea862555e8ecf784cf36fd315
2021-09-09 09:40:15 +00:00
Junyu Lai
48426bb2a4 Merge "Include suspended network when getAllNetworkStateSnapshots" 2021-09-09 09:24:04 +00:00
Kenneth Magic
e48329f533 Add CtsHostsideNetworkTests deps to sts. am: da973a6d9d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15612573

Change-Id: Ifa26896410bf53e70dafddb6cb2ef7ed59309ca4
2021-09-08 13:22:54 +00:00
Chalard Jean
ae4c414c1f Wait for validation of WiFi in OEM pref test
OEM_NETWORK_PREFERENCE_TEST prefers NOT_METERED&VALIDATED networks
then TEST networks. If the WiFi isn't validated by the time the
preference is set, then the TEST network is preferred and the test
fails. The best solution is simply to wait for the WiFi network to
validate before setting the preference.

Besides, some of the *wait* methods wait for validation and some
don't, creating confusion. Make this explicit on the
setWifiMeteredStatusAndWait method with a boolean argument, which
forces all users to make an explicit choice.

testSetOemNetworkPreferenceForTestOnlyPref is not affected, as
it does not change WiFi meteredness.

Bug: 195365654
Test: testSetOemNetworkPreferenceForTestPref
Change-Id: Icb9d7ff1ca5c3d93286ea3a79c27f15630d17ee6
2021-09-08 18:43:09 +09:00
Junyu Lai
ddecb66246 Include suspended network when getAllNetworkStateSnapshots
Suspended network should be considered as temporary shortage of
connectivity of a connected network. Thus, it should not be
excluded from network state snapshots and causes data usage to
stop accounting or iptables rules to be removed on the interface
of the suspended network.

This change also address the naming confusion of default networks
parameter of expectNotifyNetworkStatus.

Test: atest ConnectivityServiceTest#testGetAllNetworkStateSnapshots
Bug: 196079981
Change-Id: I8096356f9a472fb1c1246fbdf3fd5f981387fb1c
2021-09-08 06:02:28 +00:00
paulhu
e02bb6052d Remove NetworkUtils.queryUserAccess in test
- This method always reuturns false which is not able to use for
  testing.
- Use test restricted network for testing instead.

Bug: 183485986
Test: atest ConnectivityManagerTest
Change-Id: If34d4f1952162f118d53be8074a96b07415a5c85
2021-09-07 15:18:06 +00:00
Paul Hu
b5697afa2d Merge changes Id2ffb056,I2a4e298b am: 420fa2baef am: 9477c7b5ca
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1772667

Change-Id: I37ae39abf32d7f907896ece55cf50194b5a146cd
2021-09-07 06:28:32 +00:00
Paul Hu
9477c7b5ca Merge changes Id2ffb056,I2a4e298b am: 420fa2baef
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1772667

Change-Id: I84acbefcaf5cb95cc208d27caf8a89c0717db94e
2021-09-07 06:13:41 +00:00
Paul Hu
420fa2baef Merge changes Id2ffb056,I2a4e298b
* changes:
  Adjust some behaviors on PermissionMonitorTest
  Use common code
2021-09-07 06:01:54 +00:00
Chalard Jean
169b416bad Merge "Remove a forgotten log" am: 3d872e662e am: 3fe1865b96
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1803417

Change-Id: Idb9c8b5f3e3de8442a6ff06f05ca76737d5b490e
2021-09-07 05:04:34 +00:00
Chalard Jean
35e31a07f5 Merge "Add debug logs to CaptivePortalTests" am: fe1a4f6e60 am: 84e05d9e98
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1819792

Change-Id: I2483d08de9393396a2504988273609199d69e67e
2021-09-07 05:04:29 +00:00
Chalard Jean
3fe1865b96 Merge "Remove a forgotten log" am: 3d872e662e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1803417

Change-Id: I5714b36c6f0f71887848aa8aa41697fca6c409aa
2021-09-07 04:51:49 +00:00
Chalard Jean
84e05d9e98 Merge "Add debug logs to CaptivePortalTests" am: fe1a4f6e60
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1819792

Change-Id: I273364a1086077eb9aa355e1cce7b49e382aefbc
2021-09-07 04:51:37 +00:00
Chalard Jean
3d872e662e Merge "Remove a forgotten log" 2021-09-07 04:37:23 +00:00
Chalard Jean
fe1a4f6e60 Merge "Add debug logs to CaptivePortalTests" 2021-09-07 04:36:55 +00:00
Chiachang Wang
8ede56f676 Merge "Separate test into reasonable multiple tests" am: 26a7e61417 am: 33076dddff
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1793478

Change-Id: Ib9b4b8fae53faccd88afa36977f398ce92d2be2a
2021-09-07 03:17:26 +00:00
Chiachang Wang
33076dddff Merge "Separate test into reasonable multiple tests" am: 26a7e61417
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1793478

Change-Id: I9193477c6744c6f9a1f7e7e14e0c98e4348b262d
2021-09-07 03:01:39 +00:00
Chiachang Wang
26a7e61417 Merge "Separate test into reasonable multiple tests" 2021-09-07 02:40:13 +00:00
paulhu
941fa70744 Adjust some behaviors on PermissionMonitorTest
- This is a test only change.
- Remove calling startMonitoring() in setup() because this method
  should be called only once, so each test needs to call
  startMonitoring() if the testing function is running on it.
- Return empty list instead of null when getting installed
  pacakges in setup(). This can help test to have default user
  MOCK_USER1 when they call startMonitoring().

Bug: 192431153
Test: atests FrameworksNetTests
Change-Id: Id2ffb056b378873c3ba6a8bb31b7dedb56ad6d46
2021-09-07 09:46:23 +08:00
Paul Hu
03cc875150 Merge "Correct uid to app id for netd traffic permission methods" am: 9fe8c8fc76 am: 2fe543353b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1767733

Change-Id: I7d10079993b2441219aa575127669299932a6738
2021-09-07 01:41:05 +00:00
Paul Hu
2fe543353b Merge "Correct uid to app id for netd traffic permission methods" am: 9fe8c8fc76
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1767733

Change-Id: I11d1e21c7510c5f2d07198d8930134c6a9976708
2021-09-07 01:26:18 +00:00
paulhu
b7dd7a3f4b Use common code
- Some code are used many times, it's better to make them as
  common code for reducing inconsist behavior.
- Also stop using Boolean to represent network permissions and
  replace them with int value. Because using Boolean for
  permission comparison is really complicated and bizarre.
- Use PERMISSION_* for netd network permission directly.

Bug: 189705071
Test: atests FrameworksNetTests
Change-Id: I2a4e298b9a01f4b2874ae68e9d9539a0ab4aff4c
2021-09-07 09:25:31 +08:00
Paul Hu
9fe8c8fc76 Merge "Correct uid to app id for netd traffic permission methods" 2021-09-07 01:13:56 +00:00
Paul Hu
a6eb8fbdf6 Merge "Reduce duplicated code" am: 1d04d8362f am: f74a08823e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1767727

Change-Id: I385c0143451c0cdc6f3c0e34843ae212f8661316
2021-09-06 16:43:31 +00:00
Paul Hu
f74a08823e Merge "Reduce duplicated code" am: 1d04d8362f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1767727

Change-Id: I7612eb48c780c94b47f4741eb85b91b3cdf0a44f
2021-09-06 16:33:38 +00:00