Commit Graph

10808 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Luke Huang
50afb08ab9 Fix minor bug and deflaky for DnsResolverTest am: fcabfc688d am: f904b98507
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1486780

Change-Id: I7605d250d2980178617a631835f3234eb2d1b4c0
2020-11-09 06:05:51 +00:00
Nikita Ioffe
b2bfb81567 Merge "com.android.tethering: set min_sdk_version 30" am: 06bf173b20
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1489717

Change-Id: I652a8be5f230b1e88474e6944dc4a3306db896e9
2020-11-09 05:34:45 +00:00
Mark Chien
668adf955c Merge "Fix null DadProxy failure in R Tethering unit test" am: 220e7854bd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1485808

Change-Id: I5d40f774391b43b51c8945ca93c8d34a3b8312d2
2020-11-09 05:34:12 +00:00
Luke Huang
f904b98507 Fix minor bug and deflaky for DnsResolverTest am: fcabfc688d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1486780

Change-Id: I4283722e9600588b703c68f6170bb668cfa5eea2
2020-11-09 05:33:43 +00:00
Baligh Uddin
2d5cdaa32b [automerger skipped] Merge history of CTS am: 6a41dd4d8e -s ours am: 8ed398fd4d -s ours am: 907e27ad71 -s ours
am skip reason: Change-Id I30d52c4df571c894b7797300e8f56ddd4b2cc2dd with SHA-1 35cd54f7a0 is in history

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

Change-Id: Ibbef5c525caeff4c8fc5b2d425bd8798373f0c7b
2020-11-09 04:06:14 +00:00
Baligh Uddin
907e27ad71 [automerger skipped] Merge history of CTS am: 6a41dd4d8e -s ours am: 8ed398fd4d -s ours
am skip reason: Change-Id I30d52c4df571c894b7797300e8f56ddd4b2cc2dd with SHA-1 35cd54f7a0 is in history

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

Change-Id: Ief643822d5aa428aa7e8f08be0bc72340a81cea0
2020-11-09 03:33:21 +00:00
Baligh Uddin
8ed398fd4d [automerger skipped] Merge history of CTS am: 6a41dd4d8e -s ours
am skip reason: Change-Id I30d52c4df571c894b7797300e8f56ddd4b2cc2dd with SHA-1 35cd54f7a0 is in history

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

Change-Id: I0a9ff01c89ca043ba87faa94c6c85e63e0b8c0bd
2020-11-09 03:19:49 +00:00
Baligh Uddin
20cb4f5ab1 [automerger skipped] Merge "Merge history of CTS" into stage-aosp-master am: 667aeac161 -s ours am: bfec25dc1f -s ours am: 82630fe4be -s ours
am skip reason: Change-Id I30d52c4df571c894b7797300e8f56ddd4b2cc2dd with SHA-1 35cd54f7a0 is in history

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

Change-Id: If48528afc2992ff614bc543ef23e1c4c3743a2d1
2020-11-09 03:19:19 +00:00
Baligh Uddin
82630fe4be [automerger skipped] Merge "Merge history of CTS" into stage-aosp-master am: 667aeac161 -s ours am: bfec25dc1f -s ours
am skip reason: Change-Id I30d52c4df571c894b7797300e8f56ddd4b2cc2dd with SHA-1 35cd54f7a0 is in history

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

Change-Id: Ia41b3bdb9ddb1e7c407f7a8fa0a9512ff52cd41e
2020-11-09 02:48:23 +00:00
Baligh Uddin
6a41dd4d8e Merge history of CTS
BUG: 167962976
Test: TH
Merged-In: I30d52c4df571c894b7797300e8f56ddd4b2cc2dd
Change-Id: Id343f5a31604abfe70140343bffab20503cd2705
2020-11-09 02:17:15 +00:00
Baligh Uddin
bfec25dc1f [automerger skipped] Merge "Merge history of CTS" into stage-aosp-master am: 667aeac161 -s ours
am skip reason: Change-Id I30d52c4df571c894b7797300e8f56ddd4b2cc2dd with SHA-1 35cd54f7a0 is in history

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

Change-Id: I2070e10640ccdb27fe5dbcafa030fe3c5015ade4
2020-11-09 02:11:32 +00:00
Baligh Uddin
667aeac161 Merge "Merge history of CTS" into stage-aosp-master 2020-11-09 01:58:08 +00:00
Alan Stokes
17b1001282 Tweak NetworkWatchListTests.
Add logging to try to help diagnose flakiness.

And while I'm here, simplify & improve file closing logic.

Bug: 168216494
Test: atest CtsNetTestCases:android.net.cts.NetworkWatchlistTest
Change-Id: I1c875102f0cce32cbbe2e3b36de913741c9abb92
2020-11-06 16:57:53 +00:00
Nikita Ioffe
06bf173b20 Merge "com.android.tethering: set min_sdk_version 30" 2020-11-06 12:46:39 +00:00
Mark Chien
220e7854bd Merge "Fix null DadProxy failure in R Tethering unit test" 2020-11-06 11:00:19 +00:00
Remi NGUYEN VAN
78cb3a9de0 Use CONNECTIVITY_INTERNAL on Q for portal URL
getCaptivePortalServerUrl requires CONNECTIVITY_INTERNAL or
MAINLINE_NETWORK_STACK on Q, and NETWORK_SETTINGS or
MAINLINE_NETWORK_STACK on R+.

Use CONNECTIVITY_INTERNAL on Q instead of NETWORK_SETTINGS to test it.

Bug: 172626873
Test: atest CtsNetTestCasesLatestSdk:ConnectivityManagerTest
Change-Id: I03309de945b198ad9b40d51d799d2619bb3179ea
2020-11-06 16:14:37 +09:00
Baligh Uddin
0ed618e50a [automerger skipped] Adjust visibility for tests am: ebff93159e -s ours am: 79f9e2ab50 -s ours am: 7df146e3d5 -s ours am: 756d891be2 -s ours
am skip reason: Change-Id Ic89c084604788b4d41cf854e5015c8ce7791c64d with SHA-1 6554b75697 is in history

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

Change-Id: I80ade8fcad930224ccf21429d4110f2d6dbb8038
2020-11-06 04:38:44 +00:00
Baligh Uddin
4a6aabe68c [automerger skipped] Merge history of CTS am: 43e624246b -s ours am: a4a3eafb27 -s ours am: cea311393b -s ours am: 5a3872b5e6 -s ours
am skip reason: Change-Id Ic89c084604788b4d41cf854e5015c8ce7791c64d with SHA-1 6554b75697 is in history

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

Change-Id: I3b744e3370f23be0f1aa280de198f7c392087fe6
2020-11-06 04:38:43 +00:00
Baligh Uddin
344ad9d16a Revert "Add OWNERS block to prevent the tree from mooving during migration." am: 1711a1222c am: 5fc493d243 am: 412fcbd7d0 am: b760dfc1bb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1482768

Change-Id: I006fb81913c25bd93e22c32f27cb931260f9e4b8
2020-11-06 04:38:11 +00:00
Baligh Uddin
756d891be2 [automerger skipped] Adjust visibility for tests am: ebff93159e -s ours am: 79f9e2ab50 -s ours am: 7df146e3d5 -s ours
am skip reason: Change-Id Ic89c084604788b4d41cf854e5015c8ce7791c64d with SHA-1 6554b75697 is in history

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

Change-Id: Ida415fd3e988f2763fe92cfc2ada35e0ba2f624a
2020-11-06 04:20:57 +00:00
Baligh Uddin
5a3872b5e6 [automerger skipped] Merge history of CTS am: 43e624246b -s ours am: a4a3eafb27 -s ours am: cea311393b -s ours
am skip reason: Change-Id Ic89c084604788b4d41cf854e5015c8ce7791c64d with SHA-1 6554b75697 is in history

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

Change-Id: I06a312ab9a1794004fc2067b8d72cea215381434
2020-11-06 04:20:56 +00:00
Baligh Uddin
b760dfc1bb Revert "Add OWNERS block to prevent the tree from mooving during migration." am: 1711a1222c am: 5fc493d243 am: 412fcbd7d0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1482768

Change-Id: I15ae79db81b9a5ea8a09c9f0238f954d9cd92559
2020-11-06 04:20:50 +00:00
Baligh Uddin
7df146e3d5 [automerger skipped] Adjust visibility for tests am: ebff93159e -s ours am: 79f9e2ab50 -s ours
am skip reason: Change-Id Ic89c084604788b4d41cf854e5015c8ce7791c64d with SHA-1 6554b75697 is in history

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

Change-Id: I976b5a41b9717e27453ea2831e8adb50d80d4d4c
2020-11-06 04:06:14 +00:00
Baligh Uddin
cea311393b [automerger skipped] Merge history of CTS am: 43e624246b -s ours am: a4a3eafb27 -s ours
am skip reason: Change-Id Ic89c084604788b4d41cf854e5015c8ce7791c64d with SHA-1 6554b75697 is in history

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

Change-Id: Ib80297107effa4eb3564e524cdbc9645e0b3890e
2020-11-06 04:06:13 +00:00
Baligh Uddin
412fcbd7d0 Revert "Add OWNERS block to prevent the tree from mooving during migration." am: 1711a1222c am: 5fc493d243
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1482768

Change-Id: Id4d7cc14636b7f06bc9da1e2e835bb0bcac27d32
2020-11-06 04:06:00 +00:00
Baligh Uddin
79f9e2ab50 [automerger skipped] Adjust visibility for tests am: ebff93159e -s ours
am skip reason: Change-Id Ic89c084604788b4d41cf854e5015c8ce7791c64d with SHA-1 1711a1222c is in history

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

Change-Id: I2cd524e25ffb24575daa91ac3b33335929f3549d
2020-11-06 03:47:59 +00:00
Baligh Uddin
a4a3eafb27 [automerger skipped] Merge history of CTS am: 43e624246b -s ours
am skip reason: Change-Id Ic89c084604788b4d41cf854e5015c8ce7791c64d with SHA-1 1711a1222c is in history

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

Change-Id: If81ced42e55230b210d42238ce244e6f1620dc07
2020-11-06 03:47:57 +00:00