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
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
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
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
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
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
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
Junyu Lai
fed35219e4
[automerger skipped] Add CTS for registerNetworkOffer am: cdb727ed50 am: 7bef4177b1 -s ours
...
am skip reason: Merged-In Ic3ab3c487d8a9b5a9508b59f83ae35672307b933 with SHA-1 cdb727ed50 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14730721
Change-Id: I07e467c53074d0893256886345cbb7c7714dfad0
2021-06-21 20:17:15 +00:00
Sudheer Shanka
4a629ed834
[automerger skipped] Merge "Avoid waiting unnecessarily if there is no data to return." into sc-dev am: 858dde4109 -s ours am: 67a0ad8ce6 -s ours
...
am skip reason: Merged-In I091991aac8eb11319bd60dc8f07124ace1ad52f1 with SHA-1 f3d8c6f70e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15039587
Change-Id: Ic3f06d6b43a28f8d397e6a03f7626a567b611871
2021-06-21 20:16:37 +00:00
Junyu Lai
c67f8d2da5
[automerger skipped] Add CTS for registerNetworkOffer am: cdb727ed50 -s ours am: 35aeed5e5a -s ours
...
am skip reason: Merged-In Ic3ab3c487d8a9b5a9508b59f83ae35672307b933 with SHA-1 f20360649f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14730721
Change-Id: Ib2cdd65fc6c515488f33586d9ef62769fba0c67a
2021-06-21 20:14:42 +00:00
Sudheer Shanka
67a0ad8ce6
[automerger skipped] Merge "Avoid waiting unnecessarily if there is no data to return." into sc-dev am: 858dde4109 -s ours
...
am skip reason: Merged-In I091991aac8eb11319bd60dc8f07124ace1ad52f1 with SHA-1 f3d8c6f70e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15039587
Change-Id: I44d25f1cb3e93bcdbedf424927d42f2c4d1e16b1
2021-06-21 19:58:15 +00:00
Sudheer Shanka
5dd74098fa
Merge "Avoid waiting unnecessarily if there is no data to return." into sc-dev am: 858dde4109
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15039587
Change-Id: I3225993e2ac623c991cbc21f5c00bf9df38149d7
2021-06-21 19:58:05 +00:00
Junyu Lai
7bef4177b1
Add CTS for registerNetworkOffer am: cdb727ed50
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14730721
Change-Id: I8db28fa843fbb1f3be22f93ff6f9e0faaebf633c
2021-06-21 19:56:52 +00:00
Junyu Lai
35aeed5e5a
[automerger skipped] Add CTS for registerNetworkOffer am: cdb727ed50 -s ours
...
am skip reason: Merged-In Ic3ab3c487d8a9b5a9508b59f83ae35672307b933 with SHA-1 f20360649f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14730721
Change-Id: I328eecc56b928b84d259e66ca380163ad6b17214
2021-06-21 19:54:15 +00:00
Lucas Lin
c12550b9f4
Merge "Call ConnectivitySettingsUtils to set/get private DNS related settings"
2021-06-21 19:12:33 +00:00
Sudheer Shanka
858dde4109
Merge "Avoid waiting unnecessarily if there is no data to return." into sc-dev
2021-06-21 17:50:55 +00:00
James Mattis
420072651d
Merge "Updating timeout for Per-App CTS"
2021-06-21 17:17:13 +00:00
Treehugger Robot
e1556c49b7
[automerger skipped] Add CTS for setProfileNetworkPreference am: bd595f739c -s ours am: 16c4405446 -s ours
...
am skip reason: Merged-In Ifffdf55addbb7ec4466d4adec61e5812b7f94320 with SHA-1 bd595f739c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15044618
Change-Id: Ibd4eea9b9168a5956555fa3955e37d44d9684640
2021-06-21 16:29:26 +00:00
Treehugger Robot
77e604fac2
Merge "Add a test for ConnectivityFrameworkInitializer" am: aa397809e2 am: 62df9b8d06 am: 09733fd351
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1675598
Change-Id: I921f0cbabefad39cf5cfff8698e00bcc17b86670
2021-06-21 16:28:27 +00:00
Treehugger Robot
d736f0564e
Merge "Add test for setHttpProxyConfiguration" am: bccd97f0b3 am: 9627dd29b5 am: 353e4349d6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1564956
Change-Id: Ib592884c5b6fd58962ac88c72c8b1b8c1d7961b8
2021-06-21 16:26:47 +00:00
Junyu Lai
94cfd59dad
Merge "Add CTS for registerNetworkOffer" am: f92979bd5b am: 26bb0a84a6 am: 11ccd1531f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1731451
Change-Id: I03b680848bdee37cde4b5c2f0aaf4e31de17d3a5
2021-06-21 16:25:22 +00:00
Mark Chien
9d6b894707
Merge changes I270ff43c,Ifc7eee24 am: cec294d1b4 am: 82b26e0d1f am: 0e57c7e589
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1730548
Change-Id: I8bb4f3e23788b4d8c7d8c0ea7fc73cbd077eb829
2021-06-21 16:25:14 +00:00
Remi NGUYEN VAN
b6bf25b91a
Merge "Add connectivity coverage tests" am: cc79d7c0f8 am: 68114fe408 am: 3d25f6e8a7
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1731232
Change-Id: Ie9549d26fc4f1246e8959e326d2bd6f834bf222c
2021-06-21 16:23:57 +00:00
Treehugger Robot
aa0e1ba48f
Merge "Add CTS for setProfileNetworkPreference" am: 5d4f701244 am: 106a4752f7 am: b8a0916175
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1733784
Change-Id: I7e61573b15a57757268e7d2e300de11e6eddbdf5
2021-06-21 16:23:46 +00:00
Remi NGUYEN VAN
0d0c93a19d
Merge "Allow mocking permission in TetheringServiceTest" am: ec48bb82aa am: 4abe3f8db3 am: 381358371f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1731231
Change-Id: I0a13ebf9584e74caffee205926d1716e1aac7c9e
2021-06-21 16:23:41 +00:00
Remi NGUYEN VAN
8ddd543ea0
Merge "Initialize TetheringManager lazily" am: 7c5902df7e am: b0504221b4 am: d061ad4a60
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1736505
Change-Id: Ibb7e0b93c0c360a03b55616fb3b1af06cb94b029
2021-06-21 16:23:35 +00:00
Aaron Huang
caef428e57
Merge "CTS test for PacProxyManager" am: b93396edfb am: 7320aefbdd am: b31181a37c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1705131
Change-Id: I4a432ad05465171a90f58644a9c64dfc1ec25d22
2021-06-21 16:23:20 +00:00
Xin Li
f78f7cdc8e
[automerger skipped] DO NOT MERGE - Merge RQ3A.210605.005 am: e7fde0c39a -s ours am: 5ba981c20a -s ours am: 81d2adca15 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1741406
Change-Id: I559a987aa2bcc7102d81975609bf8d9cf701773e
2021-06-21 16:14:32 +00:00
Treehugger Robot
ae3fb7362c
Add CTS for setProfileNetworkPreference am: bd595f739c am: af1f7c528d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15044618
Change-Id: I8629e8e369fceddc8d2380e7afaf79362b5df9f3
2021-06-21 14:50:21 +00:00
Treehugger Robot
af1f7c528d
Add CTS for setProfileNetworkPreference am: bd595f739c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15044618
Change-Id: Ifb59930da0feb99477f5e4b8112248c19aa8f64a
2021-06-21 14:33:14 +00:00
Treehugger Robot
16c4405446
[automerger skipped] Add CTS for setProfileNetworkPreference am: bd595f739c -s ours
...
am skip reason: Merged-In Ifffdf55addbb7ec4466d4adec61e5812b7f94320 with SHA-1 75b109586a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15044618
Change-Id: Ibb5e79f04f2b12392ce72d217f869b4f414854a6
2021-06-21 14:31:13 +00:00
Junyu Lai
cdb727ed50
Add CTS for registerNetworkOffer
...
Test: android.net.NetworkProviderTest on R/S device
Bug: 189074532
Original-Change: https://android-review.googlesource.com/1731451
Merged-In: Ic3ab3c487d8a9b5a9508b59f83ae35672307b933
Change-Id: Ic3ab3c487d8a9b5a9508b59f83ae35672307b933
2021-06-21 14:18:34 +00:00
Treehugger Robot
09733fd351
Merge "Add a test for ConnectivityFrameworkInitializer" am: aa397809e2 am: 62df9b8d06
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1675598
Change-Id: I703593eab8e45bfaa861b93f8b274c2e86e19a24
2021-06-21 13:58:04 +00:00
Treehugger Robot
353e4349d6
Merge "Add test for setHttpProxyConfiguration" am: bccd97f0b3 am: 9627dd29b5
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1564956
Change-Id: I6ca0bdecaf5c72847b5569fd4f6ff10abfc0cba4
2021-06-21 13:57:54 +00:00
Junyu Lai
11ccd1531f
Merge "Add CTS for registerNetworkOffer" am: f92979bd5b am: 26bb0a84a6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1731451
Change-Id: I07371bcb29bd2646d9b72396a92e5c397e4a1f16
2021-06-21 13:57:37 +00:00