Commit Graph

43062 Commits

Author SHA1 Message Date
Treehugger Robot
0bb8639bc0 Merge "Add logging on UnfinishedStubbingException" am: f2ddb4151c am: e41baf1752 am: c25331f111
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1805818

Change-Id: I9cfc82e726b3b5ed7699eb0455c9349199f10f20
2021-09-13 03:14:48 +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
d5e28474f7 Merge changes from topic "presubmit-am-647350e3bf134d7da0e8df1bfb2dc418" into sc-qpr1-dev am: 814a8e4d90
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15806632

Change-Id: I215f6d9652d78191cf4e622c53a6c64deeb93335
2021-09-12 13:22:31 +00:00
Bill Yi
b60415ce32 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 069a442dc2 am: cf16330636 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib389e4f065815e7947fd53fd0085193f85209cbb
2021-09-12 13:22:30 +00:00
Bill Yi
c5a3438483 Merge changes from topic "presubmit-am-647350e3bf134d7da0e8df1bfb2dc418" into sc-dev-plus-aosp am: 1dcc8f8ab2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15806632

Change-Id: I8a3d167b51c24d37d493cb39cdc314b42f88f9c2
2021-09-12 13:22:01 +00:00
Bill Yi
dec586c025 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 069a442dc2 am: 826d98b7fa -s ours
am skip reason: subject contains skip directive

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

Change-Id: I27f40f7a9576db0e5cdd481cd69c20f627ebf1e6
2021-09-12 13:22:00 +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
Bill Yi
814a8e4d90 Merge changes from topic "presubmit-am-647350e3bf134d7da0e8df1bfb2dc418" into sc-qpr1-dev
* 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
Bill Yi
e69f09a1b8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 166f5fe82b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I80d05215fff665f65de1e845097edfd210c42760
2021-09-12 08:29:01 +00:00
Paul Hu
f8270ee51e Merge "Remove NetworkUtils.queryUserAccess in test" am: c7d5ea0bbd am: acffb5cc5a am: 31f4fd40b0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1775930

Change-Id: Iad4b613d78cb3ad3d362a823daf2684405d4649f
2021-09-11 06:54:41 +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
166f5fe82b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I60afaececda2b6b0216db73056b4eff658e168a1
2021-09-10 22:26:08 +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
cf16330636 [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: I55c96e736f9f5a9f98dd4fe4940ee4f05d9999d8
2021-09-10 22:25:03 +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
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
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
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