Sergey Troshin
b4e2432f3d
Delete AirplaneModeTest am: 2e0b45004c am: 0e4b401e69 am: 52fb8c8a8a
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1752425
Change-Id: I700d17057a99339f60099c5886bf0edbb9c7c1f2
2021-09-10 14:10:44 +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
9eeb0be292
Merge "Add back tethering to TEST_MAPPING" into stage-aosp-master am: 74f74987bc am: 22e2abfd16
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15743502
Change-Id: If50e01ca1b92fb16d83529729a2bb670bb409ea7
2021-09-10 08:08:52 +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
fd1c8e464f
Merge "Wait for validation of WiFi in OEM pref test" am: c60c1bc24e am: e6becb6820 am: 11efc29041
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1821292
Change-Id: I1c73a47673aaf31020f7392340df0ffda43f46fa
2021-09-09 19:45:48 +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
771207d044
Merge "Include suspended network when getAllNetworkStateSnapshots" am: 48426bb2a4 am: 6f988d4042 am: 357868ed59
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1797867
Change-Id: I3903451a58cbacad2f8f13c1f58b3eb9cc5576fc
2021-09-09 10:11:00 +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
f8ed2679a1
Add CtsHostsideNetworkTests deps to sts. am: da973a6d9d am: 928655800a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15612573
Change-Id: Icba86620d10c4bc625986baeabf1949b689b3523
2021-09-08 13:39:10 +00:00
Kenneth Magic
6f781d1cb8
Add CtsHostsideNetworkTests deps to sts. am: da973a6d9d am: e48329f533
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15612573
Change-Id: I86727e716e3f2de675a28abd55d3196e715b5a64
2021-09-08 13:38:50 +00:00
Kenneth Magic
928655800a
Add CtsHostsideNetworkTests deps to sts. am: da973a6d9d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15612573
Change-Id: I111fa816cd4aede1b291bd49ec2dc400a925d6cb
2021-09-08 13:24:07 +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
Paul Hu
ee4372a572
Merge changes Id2ffb056,I2a4e298b am: 420fa2baef am: 9477c7b5ca am: b5697afa2d
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1772667
Change-Id: I9715662989197c7e6a915ee71472a3bc18ac42f5
2021-09-07 06:40:36 +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
ba034f2e05
Merge "Remove a forgotten log" am: 3d872e662e am: 3fe1865b96 am: 169b416bad
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1803417
Change-Id: Id7dc1475f77389a9f05d22fc63f517ecd224bfb3
2021-09-07 05:16:46 +00:00
Chalard Jean
9ad67912dd
Merge "Add debug logs to CaptivePortalTests" am: fe1a4f6e60 am: 84e05d9e98 am: 35e31a07f5
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1819792
Change-Id: Iae2f72efe4c231ab6233881c4377e8dfdbec4c89
2021-09-07 05:16:41 +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
cd19a7ca0e
Merge "Separate test into reasonable multiple tests" am: 26a7e61417 am: 33076dddff am: 8ede56f676
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1793478
Change-Id: I17df1eb88c6ee4637e016c915559fbc6518be4e6
2021-09-07 03:31:56 +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
Paul Hu
7b1782be5c
Merge "Correct uid to app id for netd traffic permission methods" am: 9fe8c8fc76 am: 2fe543353b am: 03cc875150
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1767733
Change-Id: I094d150efcd47050c68f24bafcff518c27a9fbed
2021-09-07 02:00:09 +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
abd3d302b6
Merge "Reduce duplicated code" am: 1d04d8362f am: f74a08823e am: a6eb8fbdf6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1767727
Change-Id: If7fac1fba946a32b8c3e94840fc51672ff1920e7
2021-09-06 16:58:21 +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
Paul Hu
1d04d8362f
Merge "Reduce duplicated code"
2021-09-06 16:17:45 +00:00
Chalard Jean
d0d5c64bab
Add debug logs to CaptivePortalTests
...
The point is to help with debugging flakes of this test by
clarifying the timing of these calls with respect to when
NetworkMonitor reads the settings and the values it obtains.
Test: CaptivePortalTest
Change-Id: I29ac1d8cff1f96c91be2459e9a8f34f8ba1f38e3
2021-09-06 18:08:45 +09:00
paulhu
1d4ec79020
Correct uid to app id for netd traffic permission methods
...
Some uids should be app ids, correct them for avoiding confusion
and incorrect use.
Bug: 189705071
Test: atests FrameworksNetTests
Change-Id: I4a5930e5dc63b4d901e1567f8935ad7203866c89
2021-09-06 00:12:23 +08:00
paulhu
7a29739f2f
Reduce duplicated code
...
- This is a test only change.
- Some methods are very similar and duplicated. So merge them to
improve readability and reduce code complexity.
- Stop spying PermissionMonitor.
Bug: 189705071
Test: atests FrameworksNetTests
Change-Id: I8ec17bd2d396c4d49dd8b64be85d89d0145f4c3c
2021-09-03 15:58:15 +08:00