Chalard Jean
1cb10ffcb7
Merge "This bug was fixed in S, don't test for it in R" am: d639d12161 am: a56ea8445c am: 57674cb4d7
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1505171
Change-Id: I6d7b4a2b1b952b7d12f482ffd44676e19f28ee31
2020-11-24 10:25:17 +00:00
Chalard Jean
57674cb4d7
Merge "This bug was fixed in S, don't test for it in R" am: d639d12161 am: a56ea8445c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1505171
Change-Id: I235388b4828f7fc99c9e0776cac210dce7ba425a
2020-11-24 10:05:45 +00:00
Chalard Jean
a56ea8445c
Merge "This bug was fixed in S, don't test for it in R" am: d639d12161
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1505171
Change-Id: I80515e22a2434f5deb6001d77c7cad79d9f92615
2020-11-24 09:51:51 +00:00
Chalard Jean
d639d12161
Merge "This bug was fixed in S, don't test for it in R"
2020-11-24 07:01:57 +00:00
Chalard Jean
e90c48c9aa
This bug was fixed in S, don't test for it in R
...
Bug: 172401665
Test: CtsNetTestCasesLatestSdk
Change-Id: Ib9fb3ec09eeaebbb4ac1b1b458cfcc5c4f506cff
2020-11-20 17:54:26 +09:00
Cody Kesting
b0d9d4c91a
Merge "Use READ_PHONE_STATE when checking Carrier Configs." am: b9e51da2e8 am: 38cda37e44 am: 858c8c94c8 am: b079174dcb
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1489639
Change-Id: I47cbb1dfae6176bd8ede840636a06373ecdf358d
2020-11-17 19:57:05 +00:00
Cody Kesting
b079174dcb
Merge "Use READ_PHONE_STATE when checking Carrier Configs." am: b9e51da2e8 am: 38cda37e44 am: 858c8c94c8
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1489639
Change-Id: I3579a8295c70b2c6efad985f0cc2a570bb9e8257
2020-11-17 19:18:26 +00:00
Cody Kesting
858c8c94c8
Merge "Use READ_PHONE_STATE when checking Carrier Configs." am: b9e51da2e8 am: 38cda37e44
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1489639
Change-Id: Ib79b94583f4b72d595cf13258f6651359bb60017
2020-11-17 18:58:46 +00:00
Cody Kesting
38cda37e44
Merge "Use READ_PHONE_STATE when checking Carrier Configs." am: b9e51da2e8
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1489639
Change-Id: I84dedf9b3ff80d837f7b1fcd4a608e45db6afa00
2020-11-17 18:39:43 +00:00
Cody Kesting
b9e51da2e8
Merge "Use READ_PHONE_STATE when checking Carrier Configs."
2020-11-17 17:54:09 +00:00
Luke Huang
95dbe24bdd
[automerger skipped] Fix minor bug and deflaky for DnsResolverTest am: b896220cda -s ours
...
am skip reason: Change-Id I91190d8644ff7a7dfaf4fa3f2d43c17f67dfac11 with SHA-1 fcabfc688d is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/13051332
Change-Id: If4514b7c723b5ef0daf53d2a1d35698692840d49
2020-11-13 07:34:40 +00:00
Baligh Uddin
0622aff1fc
[automerger skipped] Merge history of CTS am: d59fc536de -s ours
...
am skip reason: Change-Id I91190d8644ff7a7dfaf4fa3f2d43c17f67dfac11 with SHA-1 fcabfc688d is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/13051330
Change-Id: Iaf07c739fa8b2db06711599233c4e72f729731a6
2020-11-13 07:34:38 +00:00
Baligh Uddin
bb3a7eb181
[automerger skipped] Revert "Merge history of CTS" am: 2f82a83bb1 -s ours
...
am skip reason: Change-Id I91190d8644ff7a7dfaf4fa3f2d43c17f67dfac11 with SHA-1 fcabfc688d is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/13051329
Change-Id: Ia7438802f22c22ae4a38024a8876ef7f4eeaa7a6
2020-11-13 07:34:33 +00:00
Luke Huang
b896220cda
Fix minor bug and deflaky for DnsResolverTest
...
1. Add the missing countdown() in the test callback
2. Add ensureWifiConnected() to prevent no available network problem.
3. Increase the timeout for awaiting private DNS setting because
current one might not be enough.
Bug: 168027339
Test atest
Merged-In: I91190d8644ff7a7dfaf4fa3f2d43c17f67dfac11
Original-Change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1486780
(cherry picked from commit e2005b0138 )
Change-Id: Id4ca3a0651b998ce614fe83f52df6362268dc43f
2020-11-13 03:42:57 +00:00
Baligh Uddin
d59fc536de
Merge history of CTS
...
BUG: 167962976
Test: TH
Merged-In: I91190d8644ff7a7dfaf4fa3f2d43c17f67dfac11
Change-Id: Iff9a8cabe6150c81f199979e802f63790e73b334
2020-11-13 01:24:50 +00:00
Baligh Uddin
2f82a83bb1
Revert "Merge history of CTS"
...
This reverts commit 4cf61e4609 .
Reason for revert: Re-Establish with History
Merged-In: I91190d8644ff7a7dfaf4fa3f2d43c17f67dfac11
Change-Id: Iea881b738f7d80bfe6931ae4f4c808560c01f282
2020-11-13 01:23:48 +00:00
Treehugger Robot
98fd4e7b1d
Merge "Add an owner for NetworkWatchlistTest." am: 4eda64baca am: 107b0a0745 am: 458c898778 am: 3cd209f671
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1492980
Change-Id: Ie4a100bd2c1a78dc3a663c140537e0fa313eea51
2020-11-12 14:53:05 +00:00
Treehugger Robot
3cd209f671
Merge "Add an owner for NetworkWatchlistTest." am: 4eda64baca am: 107b0a0745 am: 458c898778
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1492980
Change-Id: I147a1c9bcc211d2ecdc958dd9fb9f5ef927b2693
2020-11-12 13:58:18 +00:00
Treehugger Robot
458c898778
Merge "Add an owner for NetworkWatchlistTest." am: 4eda64baca am: 107b0a0745
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1492980
Change-Id: I0e0cc44b0d6cec929eeb90adf6703aa4fb5adb5e
2020-11-12 13:42:52 +00:00
Treehugger Robot
107b0a0745
Merge "Add an owner for NetworkWatchlistTest." am: 4eda64baca
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1492980
Change-Id: Icbadae3abb93626916d0d5533d515767e424a9b8
2020-11-12 13:31:55 +00:00
Treehugger Robot
4eda64baca
Merge "Add an owner for NetworkWatchlistTest."
2020-11-12 13:02:46 +00:00
Treehugger Robot
55c6c776df
Merge "Use ACCESS_WIFI_STATE when clearing wifi blacklist" am: f5ae03550a am: 85dfa5cae0 am: 531e6b8080 am: b39a8f6def
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1490016
Change-Id: Ifa5c49beeb12bfebbe2cd35e9a2cb578389b8794
2020-11-12 07:22:36 +00:00
Treehugger Robot
91148a5d94
Merge "Use CONNECTIVITY_INTERNAL on Q for portal URL" am: 2a7cf08b8e am: 58ae094ec7 am: 1a7d76dba8 am: 288211a65b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1490178
Change-Id: Ic07bea55ec41cb2ef96554b8b490b0297fb81308
2020-11-12 07:22:29 +00:00
Treehugger Robot
b39a8f6def
Merge "Use ACCESS_WIFI_STATE when clearing wifi blacklist" am: f5ae03550a am: 85dfa5cae0 am: 531e6b8080
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1490016
Change-Id: I40dfb1caa6169dcd6ecb33c9f582603d2037bee7
2020-11-12 06:46:25 +00:00
Treehugger Robot
288211a65b
Merge "Use CONNECTIVITY_INTERNAL on Q for portal URL" am: 2a7cf08b8e am: 58ae094ec7 am: 1a7d76dba8
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1490178
Change-Id: I382bdf976ef5e3635cfd7244484d279ee8263b5a
2020-11-12 06:46:07 +00:00
Treehugger Robot
531e6b8080
Merge "Use ACCESS_WIFI_STATE when clearing wifi blacklist" am: f5ae03550a am: 85dfa5cae0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1490016
Change-Id: I15f60115e5260ea159f9fb43bda1079220a8d6bd
2020-11-12 06:23:39 +00:00
Treehugger Robot
1a7d76dba8
Merge "Use CONNECTIVITY_INTERNAL on Q for portal URL" am: 2a7cf08b8e am: 58ae094ec7
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1490178
Change-Id: I305a822620fe2146b46eb04a8e2614c4d3e00873
2020-11-12 06:23:34 +00:00
Treehugger Robot
85dfa5cae0
Merge "Use ACCESS_WIFI_STATE when clearing wifi blacklist" am: f5ae03550a
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1490016
Change-Id: I0ce24470417b17ad94f11c6dcdfd4e9d1587df81
2020-11-12 06:10:21 +00:00
Treehugger Robot
58ae094ec7
Merge "Use CONNECTIVITY_INTERNAL on Q for portal URL" am: 2a7cf08b8e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1490178
Change-Id: Ie871b98591231d2f92a87e023dfb2249a9f5d2ff
2020-11-12 06:10:07 +00:00
Treehugger Robot
f5ae03550a
Merge "Use ACCESS_WIFI_STATE when clearing wifi blacklist"
2020-11-12 05:36:38 +00:00
Treehugger Robot
2a7cf08b8e
Merge "Use CONNECTIVITY_INTERNAL on Q for portal URL"
2020-11-12 05:35:20 +00:00
Luke Huang
5ccee8b14c
[automerger skipped] Fix minor bug and deflaky for DnsResolverTest am: 39ff53ead2 -s ours
...
am skip reason: Change-Id I91190d8644ff7a7dfaf4fa3f2d43c17f67dfac11 with SHA-1 fcabfc688d is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/13034728
Change-Id: I00655834f50d39a7ae08f6a275ff3c6cc1bc13be
2020-11-11 18:12:56 +00:00
Luke Huang
39ff53ead2
Fix minor bug and deflaky for DnsResolverTest
...
1. Add the missing countdown() in the test callback
2. Add ensureWifiConnected() to prevent no available network problem.
3. Increase the timeout for awaiting private DNS setting because
current one might not be enough.
Bug: 168027339
Test atest
Change-Id: I0ee8161fac3b6db7a000ddb0a057cd91a17bd7d5
Merged-In: I91190d8644ff7a7dfaf4fa3f2d43c17f67dfac11
Original-Change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1486780
(cherry picked from commit e2005b0138 )
2020-11-11 16:05:21 +00:00
paulhu
311d14fd72
[automerger skipped] Fix tethering doesn't turn off issue am: f1a6afb46a -s ours
...
am skip reason: Change-Id Icb9649a5ecdec2d029ac763b5b9b80042ad50eb9 with SHA-1 862c8a1ea0 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/13033277
Change-Id: I4fba4df88ab314badf82c804056dd45a640786f6
2020-11-11 06:44:26 +00:00
paulhu
f1a6afb46a
Fix tethering doesn't turn off issue
...
When user restriction turns on, all tethering functions should
be disabled. But tethering functions still work after
restrication is on. Because tethering request would be removed
from mActiveTetheringRequests after starting tethering that
will result in Tethering#isTetheringActive() always returns
false. Thus, update the design to check tethered interface to
ensure that any of tethering function is working.
Bug: 169596583
Test: atest TetheringTests
Test: Manually test that tethering function would be disabled
and notification would show to user after restriction
was on.
Change-Id: Icb9649a5ecdec2d029ac763b5b9b80042ad50eb9
Merged-In: Icb9649a5ecdec2d029ac763b5b9b80042ad50eb9
(cherry picked from commit b2c0185da4 , aosp/1484019)
2020-11-11 03:26:19 +00:00
paulhu
b2c0185da4
Fix tethering doesn't turn off issue am: 862c8a1ea0 am: cd34630e6b am: 1b62a26c1a am: c7884164c6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1484019
Change-Id: I896b23cf0e7d622d6814940656cd72a17f591a22
2020-11-10 16:40:27 +00:00
paulhu
c7884164c6
Fix tethering doesn't turn off issue am: 862c8a1ea0 am: cd34630e6b am: 1b62a26c1a
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1484019
Change-Id: I8964fc25943a9daf6447a56267d5a90ed4cd9c61
2020-11-10 16:08:43 +00:00
paulhu
1b62a26c1a
Fix tethering doesn't turn off issue am: 862c8a1ea0 am: cd34630e6b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1484019
Change-Id: I8f1417a1317acf18fe0d8a133fb83c095e14f8c1
2020-11-10 15:35:23 +00:00
paulhu
cd34630e6b
Fix tethering doesn't turn off issue am: 862c8a1ea0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1484019
Change-Id: I58cad341b3ac7623ae7303f66bb95b057485a8c6
2020-11-10 15:19:39 +00:00
Alan Stokes
108f82b463
Add an owner for NetworkWatchlistTest.
...
Test: N/A
Change-Id: Icfbeaf60e1ff98d29c449b9fcc43c0e5ce39a20e
2020-11-10 11:36:30 +00:00
TreeHugger Robot
8f7c1c2d3d
Merge "Tweak NetworkWatchListTests."
2020-11-10 10:21:52 +00:00
paulhu
862c8a1ea0
Fix tethering doesn't turn off issue
...
When user restriction turns on, all tethering functions should
be disabled. But tethering functions still work after
restrication is on. Because tethering request would be removed
from mActiveTetheringRequests after starting tethering that
will result in Tethering#isTetheringActive() always returns
false. Thus, update the design to check tethered interface to
ensure that any of tethering function is working.
Bug: 169596583
Test: atest TetheringTests
Test: Manually test that tethering function would be disabled
and notification would show to user after restriction
was on.
Change-Id: Icb9649a5ecdec2d029ac763b5b9b80042ad50eb9
2020-11-10 16:47:52 +08:00
Nikita Ioffe
abd1977ea7
[automerger skipped] Merge "com.android.tethering: set min_sdk_version 30" am: 06bf173b20 am: b2bfb81567 am: b6313e4e2c am: 9200906157 -s ours
...
am skip reason: Change-Id Ic91cf96dda6419d1038b0329b920f9cd24482aef with SHA-1 1fe1e539e1 is in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1489717
Change-Id: I39289b3fa6cb76dc8c320d56a09eded5fd67f44c
2020-11-09 06:53:15 +00:00
Mark Chien
38d781ae57
Merge "Fix null DadProxy failure in R Tethering unit test" am: 220e7854bd am: 668adf955c am: 8b3c07d951 am: a6bb7e3340
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1485808
Change-Id: I351e5dc3afaf61e5cf82913872ec0bec1e99a094
2020-11-09 06:53:04 +00:00
Luke Huang
e2005b0138
Fix minor bug and deflaky for DnsResolverTest am: fcabfc688d am: f904b98507 am: 50afb08ab9 am: 3aad4761fe
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1486780
Change-Id: I0ee8161fac3b6db7a000ddb0a057cd91a17bd7d5
2020-11-09 06:52:52 +00:00
Nikita Ioffe
9200906157
Merge "com.android.tethering: set min_sdk_version 30" am: 06bf173b20 am: b2bfb81567 am: b6313e4e2c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1489717
Change-Id: Ib51053849e6d451dcfb39f48c8b090a3d50075f9
2020-11-09 06:21:19 +00:00
Mark Chien
a6bb7e3340
Merge "Fix null DadProxy failure in R Tethering unit test" am: 220e7854bd am: 668adf955c am: 8b3c07d951
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1485808
Change-Id: I68b875aa7daf81a71d806d1300eecb581a54e7df
2020-11-09 06:21:05 +00:00
Luke Huang
3aad4761fe
Fix minor bug and deflaky for DnsResolverTest am: fcabfc688d am: f904b98507 am: 50afb08ab9
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1486780
Change-Id: Ia554e112b5d67e68e8f9ba8c1b19ee086c8bf2fc
2020-11-09 06:20:45 +00:00
Nikita Ioffe
b6313e4e2c
Merge "com.android.tethering: set min_sdk_version 30" am: 06bf173b20 am: b2bfb81567
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1489717
Change-Id: I8ff9ecaa92dbbf39659211b05ef9469c25909e12
2020-11-09 06:06:37 +00:00
Mark Chien
8b3c07d951
Merge "Fix null DadProxy failure in R Tethering unit test" am: 220e7854bd am: 668adf955c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1485808
Change-Id: I3f1d7019f1a12647b78630a412df3adf03e9e95a
2020-11-09 06:06:24 +00:00