Commit Graph

43872 Commits

Author SHA1 Message Date
Remi NGUYEN VAN
9caa35a77d [automerger skipped] Merge changes I49e5a99f,Ia3e4b336 into sc-dev am: 77fdd31db1 -s ours am: e72bac1be4 -s ours
am skip reason: Merged-In I49e5a99f18a5651370e6914f30be659134b537ff with SHA-1 4dad9710e1 is already in history

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

Change-Id: Ia867bf40982a0fe2045f346727faaab00448a72b
2021-06-22 23:35:55 +00:00
Mark Chien
922fcaab13 [automerger skipped] Merge "Disable tryCell when UpstreamMonitor stop" into sc-dev am: 07584931b5 -s ours am: 33f2121413 -s ours
am skip reason: Merged-In I5505655f52da9fdca2fd43a58e043a9ab727741d with SHA-1 89f2670b65 is already in history

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

Change-Id: I97f5c246954934307af0ce97d9885ded0e4f479b
2021-06-22 23:35:50 +00:00
Lorenzo Colitti
06f4e7bc1e [automerger skipped] Merge changes I270ff43c,Ifc7eee24 into sc-dev am: 6cea6edc9c -s ours am: 285821741c -s ours
am skip reason: Merged-In I270ff43c01736b9d18bd40a8e88e1379e9e4e863 with SHA-1 76e2e1c702 is already in history

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

Change-Id: If882d6758479021a6704b00aa1f5d1ac5dffc47d
2021-06-22 23:35:45 +00:00
Paul Hu
d6ba373eab Merge "Add test for CSM#[get|set]MobileDataPreferredUids" am: 5440e0b8e8 am: 732ab7557c am: e203a29272
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1736504

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

Change-Id: I75fc790519db08424dc43ce614463bb2781cd927
2021-06-22 23:35:29 +00:00
Treehugger Robot
de982e0b35 [automerger skipped] Add a test for ConnectivityFrameworkInitializer am: 3750a9f12e am: b502c907d9 -s ours
am skip reason: Merged-In I485b0dbd2e9dc557560a2b7bee2cff54c7f66c93 with SHA-1 944d87d179 is already in history

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

Change-Id: Ifef8b097101d905c75e841f917f20c105ba8cc1c
2021-06-22 11:52:35 +00:00
Treehugger Robot
b502c907d9 Add a test for ConnectivityFrameworkInitializer am: 3750a9f12e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15057276

Change-Id: I2df700fcadf39e2e6f540397d80cf0f6c6b960a8
2021-06-22 11:39:25 +00:00
Remi NGUYEN VAN
7cce8a66fe [automerger skipped] Merge changes I49e5a99f,Ia3e4b336 into sc-dev am: 77fdd31db1 am: f9678d1008 -s ours
am skip reason: Merged-In I49e5a99f18a5651370e6914f30be659134b537ff with SHA-1 4dad9710e1 is already in history

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

Change-Id: Ie4228b266a3822aba482db27404b444a7a5d4e21
2021-06-22 10:25:58 +00:00
James Mattis
6d0ac08cce [automerger skipped] CTS tests for setOemNetworkPreference am: 904351cdcf am: 1bd9423329 -s ours
am skip reason: Merged-In Ia3e4b336123b60f6df1582aca2979129112afedc with SHA-1 db143f99cf is already in history

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

Change-Id: I6289dbac224a52cde7702f3ecc2a68ddd8232597
2021-06-22 10:25:55 +00:00
Remi NGUYEN VAN
f9678d1008 Merge changes I49e5a99f,Ia3e4b336 into sc-dev am: 77fdd31db1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15054374

Change-Id: I99ef58f523c1160e32911b56842202e0657f4015
2021-06-22 10:12:03 +00:00
James Mattis
1bd9423329 CTS tests for setOemNetworkPreference am: 904351cdcf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15054373

Change-Id: I32e8c57466997ff95c6251552ddb00d5e54d19f4
2021-06-22 10:12:00 +00:00
Remi NGUYEN VAN
e72bac1be4 [automerger skipped] Merge changes I49e5a99f,Ia3e4b336 into sc-dev am: 77fdd31db1 -s ours
am skip reason: Merged-In I49e5a99f18a5651370e6914f30be659134b537ff with SHA-1 4dad9710e1 is already in history

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

Change-Id: I3ca7ef1325d4f04a138bf8012de57bbb89825bd4
2021-06-22 10:08:43 +00:00
Treehugger Robot
3750a9f12e Add a test for ConnectivityFrameworkInitializer
The test verifies that system services were registered, meaning that
ConnectivityFrameworkInitializer.registerServiceWrappers ran
successfully on startup, and that calling it afterwards throws.

Bug: 171540887
Test: atest ConnectivityFrameworkInitializerTest
Original-Change: https://android-review.googlesource.com/1675598
Merged-In: I485b0dbd2e9dc557560a2b7bee2cff54c7f66c93
Change-Id: I485b0dbd2e9dc557560a2b7bee2cff54c7f66c93
2021-06-22 09:31:14 +00:00
Remi NGUYEN VAN
77fdd31db1 Merge changes I49e5a99f,Ia3e4b336 into sc-dev
* changes:
  Updating timeout for Per-App CTS
  CTS tests for setOemNetworkPreference
2021-06-22 08:59:27 +00:00
Mark Chien
79602206bb [automerger skipped] Merge "Disable tryCell when UpstreamMonitor stop" into sc-dev am: 07584931b5 am: 05e41ef67a -s ours
am skip reason: Merged-In I5505655f52da9fdca2fd43a58e043a9ab727741d with SHA-1 89f2670b65 is already in history

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

Change-Id: Ia290fc3065f77b642cc74cbe0d4cd9e546105634
2021-06-22 08:15:05 +00:00
Mark Chien
05e41ef67a Merge "Disable tryCell when UpstreamMonitor stop" into sc-dev am: 07584931b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15057271

Change-Id: I734d263bd923bb62d7555cc264f83d70a558a72c
2021-06-22 07:58:26 +00:00
Mark Chien
33f2121413 [automerger skipped] Merge "Disable tryCell when UpstreamMonitor stop" into sc-dev am: 07584931b5 -s ours
am skip reason: Merged-In I5505655f52da9fdca2fd43a58e043a9ab727741d with SHA-1 89f2670b65 is already in history

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

Change-Id: I4241e69f0fd88bcab4a3f73c3bdad9dd1a2a090a
2021-06-22 07:57:22 +00:00
Mark Chien
07584931b5 Merge "Disable tryCell when UpstreamMonitor stop" into sc-dev 2021-06-22 07:34:35 +00:00
Lorenzo Colitti
f1f00f4675 [automerger skipped] Merge changes I270ff43c,Ifc7eee24 into sc-dev am: 6cea6edc9c am: 1aea6ea321 -s ours
am skip reason: Merged-In I270ff43c01736b9d18bd40a8e88e1379e9e4e863 with SHA-1 76e2e1c702 is already in history

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

Change-Id: I9c40d033fc44bcc8e8db7b88a2e6c88e12c7678e
2021-06-22 05:05:19 +00:00
markchien
9d30155b52 [automerger skipped] Allow to use ncm function for usb tethering am: 67bf9b5654 am: 4dbb985d40 -s ours
am skip reason: Merged-In Ifc7eee2457a950a0e2d1c3cc89a3373a7ad23c9c with SHA-1 cab01b7ebc is already in history

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

Change-Id: Ia9b23bea95976be34ecc3bc4d31e028892c7817f
2021-06-22 05:05:17 +00:00
Lorenzo Colitti
1aea6ea321 Merge changes I270ff43c,Ifc7eee24 into sc-dev am: 6cea6edc9c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15044629

Change-Id: I980645261d72ea068739c235988417c277fb8bf5
2021-06-22 04:51:18 +00:00
markchien
4dbb985d40 Allow to use ncm function for usb tethering am: 67bf9b5654
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14782684

Change-Id: Ib8212ebcf5d6616b244e1dba65c9a16be2505302
2021-06-22 04:51:16 +00:00
Lorenzo Colitti
285821741c [automerger skipped] Merge changes I270ff43c,Ifc7eee24 into sc-dev am: 6cea6edc9c -s ours
am skip reason: Merged-In I270ff43c01736b9d18bd40a8e88e1379e9e4e863 with SHA-1 76e2e1c702 is already in history

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

Change-Id: I60100ab98d696b79dae3fd2def6f086138a59f86
2021-06-22 04:49:59 +00:00
Lorenzo Colitti
6cea6edc9c Merge changes I270ff43c,Ifc7eee24 into sc-dev
* changes:
  Add enable and disable ip serving common functions
  Allow to use ncm function for usb tethering
2021-06-22 04:31:09 +00: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
Paul Hu
732ab7557c Merge "Add test for CSM#[get|set]MobileDataPreferredUids" am: 5440e0b8e8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1736504

Change-Id: I1db27baa42bcaccbabf9002c950fdcefa6fb2710
2021-06-22 03:26:32 +00:00
Mark Chien
2d36831a38 Disable tryCell when UpstreamMonitor stop
tryCell configuration would not be force disabled UpstreamMonitor stop.
If tethering stop with using mobile upstream and swap with SIM fron no
dun to dun supported, dun request would be filed even tethering is not
active.

Bug: 173068192
Test: atest TetheringTests
Original-Change: https://android-review.googlesource.com/1715791
Merged-In: I5505655f52da9fdca2fd43a58e043a9ab727741d
Change-Id: I5505655f52da9fdca2fd43a58e043a9ab727741d
2021-06-22 03:17:53 +00:00
Lucas Lin
d7e6b4dfa9 Merge "Add CTS for isUidNetworkingBlocked & isUidRestrictedOnMeteredNetworks" am: 3f565a44b0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1737395

Change-Id: Id3454c2b2efdf17c3f84fc2e04e14c022baff825
2021-06-22 03:16:30 +00:00
markchien
076ad01a4a Add enable and disable ip serving common functions
This is a op CL which prepare for refactor.

Bug: 185649441
Bug: 189410000
Bug: 178116595

Test: atest TetheringTests
Original-Change: https://android-review.googlesource.com/1730548
Merged-In: I270ff43c01736b9d18bd40a8e88e1379e9e4e863
Change-Id: I270ff43c01736b9d18bd40a8e88e1379e9e4e863
2021-06-22 11:04:02 +08:00
markchien
67bf9b5654 Allow to use ncm function for usb tethering
Adding the configuration to decide using rndis or ncm for usb tethering.
If ncm is configured for TETHEIRNG_USB, then TETHERING_NCM is not
available.

Bug: 162920185
Test: atest TetheringTests
      manul testing usb tethering
Original-Change: https://android-review.googlesource.com/1730541
Merged-In: Ifc7eee2457a950a0e2d1c3cc89a3373a7ad23c9c
Change-Id: Ifc7eee2457a950a0e2d1c3cc89a3373a7ad23c9c
2021-06-22 11:03:11 +08:00
Paul Hu
5440e0b8e8 Merge "Add test for CSM#[get|set]MobileDataPreferredUids" 2021-06-22 01:33:49 +00:00
Lucas Lin
f275ab3b59 Merge "Use assertEquals instead of assertTrue to compare the vpn type" am: 56055496f3 am: 9ca145bcfa am: da9c2fb600
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1739093

Change-Id: I3f2bcca1416941cf9118fd016224bdf3c16c1642
2021-06-22 00:14:33 +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
Lucas Lin
3f565a44b0 Merge "Add CTS for isUidNetworkingBlocked & isUidRestrictedOnMeteredNetworks" 2021-06-21 23:58:49 +00:00
Lucas Lin
c888a94919 Merge "Add CTS for systemReady() & getIpSecNetIdRange()" am: 7e2a491835 am: 72d2223bf7 am: f602b03178
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1676425

Change-Id: I1665e286a330218d58b9e4355b28e3b49dc39d08
2021-06-21 23:56:03 +00:00
Lucas Lin
9ca145bcfa Merge "Use assertEquals instead of assertTrue to compare the vpn type" am: 56055496f3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1739093

Change-Id: I91b2ece57f79308436cf34ab3fbf9cdbd6961ed7
2021-06-21 23:50:27 +00:00
Lucas Lin
f602b03178 Merge "Add CTS for systemReady() & getIpSecNetIdRange()" am: 7e2a491835 am: 72d2223bf7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1676425

Change-Id: I6cc3cc6f52ffb783bb21e3914b4eacd19756d755
2021-06-21 23:37:47 +00:00
Lucas Lin
56055496f3 Merge "Use assertEquals instead of assertTrue to compare the vpn type" 2021-06-21 23:35:16 +00:00
Lucas Lin
72d2223bf7 Merge "Add CTS for systemReady() & getIpSecNetIdRange()" am: 7e2a491835
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1676425

Change-Id: I6a26a8b344c367ce1b876ce67a443435f3de776a
2021-06-21 23:22:19 +00:00
Lucas Lin
b0605482b2 Merge "Call ConnectivitySettingsUtils to set/get private DNS related settings" am: c12550b9f4 am: 8f8e1512d6 am: 833cb00abf
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719017

Change-Id: I195565035ccb7bdeeadd8a19b169d04778d8d34c
2021-06-21 21:03:38 +00:00
James Mattis
8a1b528f7a Merge "Updating timeout for Per-App CTS" am: 420072651d am: eaa493d033 am: ed5d25d599
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1736927

Change-Id: Iae37a86e0a4aa323652a9b72178a8cd029f032d0
2021-06-21 21:03:26 +00:00
James Mattis
17a96282f0 Updating timeout for Per-App CTS
Increasing the timeout values for waiting for callbacks for the per-app
CTS tests to match the timeout value used in the waitForAvailable()
helper method.

Bug: 191230288
Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest

Original-Change: https://android-review.googlesource.com/1736927
Merged-in: I49e5a99f18a5651370e6914f30be659134b537ff
Change-Id: I49e5a99f18a5651370e6914f30be659134b537ff
2021-06-21 13:53:27 -07:00
Lucas Lin
7e2a491835 Merge "Add CTS for systemReady() & getIpSecNetIdRange()" 2021-06-21 20:52:46 +00:00
Lucas Lin
833cb00abf Merge "Call ConnectivitySettingsUtils to set/get private DNS related settings" am: c12550b9f4 am: 8f8e1512d6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719017

Change-Id: Ifbe743b2f1eccfb1e553e6521cc0a461a8a475d8
2021-06-21 20:51:42 +00:00
James Mattis
904351cdcf CTS tests for setOemNetworkPreference
CTS tests to validate the setOemNetworkPreference API on
ConnectivityManager. Additionally, a small bit of cleanup for
assumptions around the Wi-Fi feature.

Bug: 176496580
Bug: 176494815
Test: atest CtsNetTestCases:
android.net.cts.ConnectivityManagerTest#
testSetOemNetworkPreferenceForTestPref --iterations
atest CtsNetTestCases:
android.net.cts.ConnectivityManagerTest#
testSetOemNetworkPreferenceForTestOnlyPref --iterations

Original-Change: https://android-review.googlesource.com/1665079
Merged-in: Ia3e4b336123b60f6df1582aca2979129112afedc
Change-Id: Ia3e4b336123b60f6df1582aca2979129112afedc
2021-06-21 13:51:07 -07:00
James Mattis
ed5d25d599 Merge "Updating timeout for Per-App CTS" am: 420072651d am: eaa493d033
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1736927

Change-Id: Ia7035d953fe0f073467b608b58aa06f65a313224
2021-06-21 20:50:56 +00:00
Lucas Lin
8f8e1512d6 Merge "Call ConnectivitySettingsUtils to set/get private DNS related settings" am: c12550b9f4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719017

Change-Id: I1b0b4beb6653cfc5d09da3d5eda18a6b0a980982
2021-06-21 20:22:10 +00:00
James Mattis
eaa493d033 Merge "Updating timeout for Per-App CTS" am: 420072651d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1736927

Change-Id: I53a0510dd4008be8cb68daf6c65f816b8d0f68a2
2021-06-21 20:21:55 +00:00
Sudheer Shanka
717ae0f11d [automerger skipped] Merge "Avoid waiting unnecessarily if there is no data to return." into sc-dev am: 858dde4109 am: 5dd74098fa -s ours
am skip reason: Merged-In I091991aac8eb11319bd60dc8f07124ace1ad52f1 with SHA-1 c017d9adf3 is already in history

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

Change-Id: Iac2aeb4445cdd1dc3d55cbfd5124e13506864976
2021-06-21 20:17:21 +00:00