Commit Graph

6283 Commits

Author SHA1 Message Date
Automerger Merge Worker
3f61ebfe01 Merge "[automerger skipped] Merge "Fix tests that failed on devices without IPsec tunnel feature" into rvc-dev am: 91e4a69abe am: b12f23f68a -s ours" into rvc-d1-dev-plus-aosp am: d40742b7fb -s ours am: 418c86df16 -s ours
am skip reason: Change-Id I9a8c7f631f0e6e02492816e3fbf0d751017dc2b3 with SHA-1 dfd08cab51 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11813719

Change-Id: If58b8657202371c734be7b2a5f75b25584439b76
2020-06-15 17:43:23 +00:00
Yan Yan
a196edfe0b [automerger skipped] Merge "Fix tests that failed on devices without IPsec tunnel feature" into rvc-dev am: 91e4a69abe -s ours am: 5cf96925d2 -s ours am: b3bf07b6b3 -s ours am: c014e8c450 -s ours
am skip reason: Change-Id I9a8c7f631f0e6e02492816e3fbf0d751017dc2b3 with SHA-1 ce3c9ae278 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11813719

Change-Id: Ib3670166ee8c2e544bdcc149705cbbc681499821
2020-06-15 17:43:04 +00:00
Automerger Merge Worker
418c86df16 Merge "[automerger skipped] Merge "Fix tests that failed on devices without IPsec tunnel feature" into rvc-dev am: 91e4a69abe am: b12f23f68a -s ours" into rvc-d1-dev-plus-aosp am: d40742b7fb -s ours
am skip reason: Change-Id I9a8c7f631f0e6e02492816e3fbf0d751017dc2b3 with SHA-1 dfd08cab51 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11813719

Change-Id: Idd289cb516297e231c4c9c8b86ab91a574c2407e
2020-06-15 17:30:22 +00:00
Yan Yan
c014e8c450 [automerger skipped] Merge "Fix tests that failed on devices without IPsec tunnel feature" into rvc-dev am: 91e4a69abe -s ours am: 5cf96925d2 -s ours am: b3bf07b6b3 -s ours
am skip reason: Change-Id I9a8c7f631f0e6e02492816e3fbf0d751017dc2b3 with SHA-1 ce3c9ae278 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11813719

Change-Id: I0823a523f0c44b30b6db04ab21bc466d2b4b1d25
2020-06-15 17:30:15 +00:00
Automerger Merge Worker
d40742b7fb Merge "[automerger skipped] Merge "Fix tests that failed on devices without IPsec tunnel feature" into rvc-dev am: 91e4a69abe am: b12f23f68a -s ours" into rvc-d1-dev-plus-aosp 2020-06-15 17:19:05 +00:00
Yan Yan
e68a74ad49 [automerger skipped] Merge "Fix tests that failed on devices without IPsec tunnel feature" into rvc-dev am: 91e4a69abe am: b12f23f68a -s ours
am skip reason: Change-Id I9a8c7f631f0e6e02492816e3fbf0d751017dc2b3 with SHA-1 ce3c9ae278 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11813719

Change-Id: Ie657ef6aca17b9af21b7eee1e3ef3df4fffeaea0
2020-06-15 17:18:59 +00:00
Yan Yan
b3bf07b6b3 [automerger skipped] Merge "Fix tests that failed on devices without IPsec tunnel feature" into rvc-dev am: 91e4a69abe -s ours am: 5cf96925d2 -s ours
am skip reason: Change-Id I9a8c7f631f0e6e02492816e3fbf0d751017dc2b3 with SHA-1 ce3c9ae278 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11813719

Change-Id: Ic1bdae74c4307f46feae04a4de951520d436a9cf
2020-06-15 17:18:57 +00:00
Yan Yan
b12f23f68a Merge "Fix tests that failed on devices without IPsec tunnel feature" into rvc-dev am: 91e4a69abe
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11813719

Change-Id: I9a472d7fb0610439f6d753bb22f302a1d754fd50
2020-06-15 17:05:11 +00:00
Yan Yan
5cf96925d2 [automerger skipped] Merge "Fix tests that failed on devices without IPsec tunnel feature" into rvc-dev am: 91e4a69abe -s ours
am skip reason: Change-Id I9a8c7f631f0e6e02492816e3fbf0d751017dc2b3 with SHA-1 ce3c9ae278 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11813719

Change-Id: I4379b1f57e74d5cb10dbabf57c6245c73a8b7c29
2020-06-15 17:05:09 +00:00
Yan Yan
91e4a69abe Merge "Fix tests that failed on devices without IPsec tunnel feature" into rvc-dev 2020-06-15 17:03:23 +00:00
Automerger Merge Worker
d5f988ebdf Merge "[automerger skipped] Fix CtsTetheringTest on devices without permanent softAp interfaces. am: 3abe36567c -s ours am: b49bc69af3 -s ours am: e7cf109b3e -s ours" into rvc-qpr-dev-plus-aosp am: 4cb05468ee -s ours
am skip reason: Change-Id I0ba6bc9dcbf7829dcad5561c707d5f5c5540f10b with SHA-1 3abe36567c is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11863001

Change-Id: I7bc16926335e9ba969d5bdb306d2148485d27064
2020-06-15 14:30:33 +00:00
Automerger Merge Worker
fb8fa268a5 Merge "[automerger skipped] Fix CtsTetheringTest on devices without permanent softAp interfaces. am: 3abe36567c am: ef7d1e44ca am: a3331299ce -s ours" into rvc-qpr-dev-plus-aosp am: 7178cff10a -s ours
am skip reason: Change-Id I0ba6bc9dcbf7829dcad5561c707d5f5c5540f10b with SHA-1 3abe36567c is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11863001

Change-Id: If7436d22e588264d78480f18312c6475de6b18d8
2020-06-15 14:29:13 +00:00
Treehugger Robot
efd93dce11 [automerger skipped] Fix CtsTetheringTest on devices without permanent softAp interfaces. am: 3abe36567c am: ef7d1e44ca -s ours am: cd011d8048 -s ours am: 345750862b -s ours
am skip reason: Change-Id I0ba6bc9dcbf7829dcad5561c707d5f5c5540f10b with SHA-1 24d8b8391e is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11863001

Change-Id: If75a810be7316855e06d55c6051ef201c795c9a2
2020-06-15 14:28:20 +00:00
Automerger Merge Worker
4cb05468ee Merge "[automerger skipped] Fix CtsTetheringTest on devices without permanent softAp interfaces. am: 3abe36567c -s ours am: b49bc69af3 -s ours am: e7cf109b3e -s ours" into rvc-qpr-dev-plus-aosp 2020-06-15 14:11:48 +00:00
Automerger Merge Worker
7178cff10a Merge "[automerger skipped] Fix CtsTetheringTest on devices without permanent softAp interfaces. am: 3abe36567c am: ef7d1e44ca am: a3331299ce -s ours" into rvc-qpr-dev-plus-aosp 2020-06-15 14:11:45 +00:00
Treehugger Robot
5050b6542c [automerger skipped] Fix CtsTetheringTest on devices without permanent softAp interfaces. am: 3abe36567c -s ours am: b49bc69af3 -s ours am: e7cf109b3e -s ours
am skip reason: Change-Id I0ba6bc9dcbf7829dcad5561c707d5f5c5540f10b with SHA-1 3abe36567c is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11863001

Change-Id: Ia5bd2eb0c467e7757e62d66fea938e3950bd8f96
2020-06-15 14:11:44 +00:00
Treehugger Robot
99793f255e [automerger skipped] Fix CtsTetheringTest on devices without permanent softAp interfaces. am: 3abe36567c am: ef7d1e44ca am: a3331299ce -s ours
am skip reason: Change-Id I0ba6bc9dcbf7829dcad5561c707d5f5c5540f10b with SHA-1 24d8b8391e is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11863001

Change-Id: Iaf3c713a9f8d399589e18bfd8fc2f541bd89e9bb
2020-06-15 14:11:38 +00:00
Treehugger Robot
345750862b [automerger skipped] Fix CtsTetheringTest on devices without permanent softAp interfaces. am: 3abe36567c am: ef7d1e44ca -s ours am: cd011d8048 -s ours
am skip reason: Change-Id I0ba6bc9dcbf7829dcad5561c707d5f5c5540f10b with SHA-1 24d8b8391e is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11863001

Change-Id: I2afd39c9b7ff6e3d8343407448e5040fe60ac9b4
2020-06-15 14:11:32 +00:00
Treehugger Robot
e7cf109b3e [automerger skipped] Fix CtsTetheringTest on devices without permanent softAp interfaces. am: 3abe36567c -s ours am: b49bc69af3 -s ours
am skip reason: Change-Id I0ba6bc9dcbf7829dcad5561c707d5f5c5540f10b with SHA-1 24d8b8391e is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11863001

Change-Id: Iee403b18ad68d5e1cb314abfc8f0e29f30fb6000
2020-06-15 13:58:50 +00:00
Treehugger Robot
cd011d8048 [automerger skipped] Fix CtsTetheringTest on devices without permanent softAp interfaces. am: 3abe36567c am: ef7d1e44ca -s ours
am skip reason: Change-Id I0ba6bc9dcbf7829dcad5561c707d5f5c5540f10b with SHA-1 24d8b8391e is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11863001

Change-Id: I0c9aad45309fa76f3945549ee8a1bed50d60f20f
2020-06-15 13:58:42 +00:00
Treehugger Robot
ef7d1e44ca Fix CtsTetheringTest on devices without permanent softAp interfaces. am: 3abe36567c
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11863001

Change-Id: Ic930dd7826e5ba1169374c278dc67ea4fa799447
2020-06-15 13:47:29 +00:00
Treehugger Robot
b49bc69af3 [automerger skipped] Fix CtsTetheringTest on devices without permanent softAp interfaces. am: 3abe36567c -s ours
am skip reason: Change-Id I0ba6bc9dcbf7829dcad5561c707d5f5c5540f10b with SHA-1 24d8b8391e is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11863001

Change-Id: I59264cbfcd41a0e5382a41ba6cbb1096cfcea15e
2020-06-15 13:47:27 +00:00
TreeHugger Robot
d43a5f4f0c Merge "Bump CtsNetTestCasesLatestSdk to target SDK 30." into rvc-dev am: d69d28f755 am: 6c56cf06e3 am: b857d32541 am: a8af6b2389
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11850382

Change-Id: Ib55b6813dbfcdab5c74b82c5455038bbda644dc5
2020-06-15 12:22:21 +00:00
TreeHugger Robot
a8af6b2389 Merge "Bump CtsNetTestCasesLatestSdk to target SDK 30." into rvc-dev am: d69d28f755 am: 6c56cf06e3 am: b857d32541
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11850382

Change-Id: I15ea442b8b3701ca16e0c22710d629c6d2e55095
2020-06-15 12:17:15 +00:00
TreeHugger Robot
e4cd2ac152 Merge "Bump CtsNetTestCasesLatestSdk to target SDK 30." into rvc-dev am: d69d28f755 am: 9daa97c7d6 am: 9ba6fb6829 am: ea017b639a
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11850382

Change-Id: Ie36bd54f929d2589f6cf8b21e30e9429ec2240bf
2020-06-15 12:16:52 +00:00
TreeHugger Robot
ea017b639a Merge "Bump CtsNetTestCasesLatestSdk to target SDK 30." into rvc-dev am: d69d28f755 am: 9daa97c7d6 am: 9ba6fb6829
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11850382

Change-Id: Iba4adbfaf2d81a26d8737b2c72e856bdd433099b
2020-06-15 12:16:37 +00:00
TreeHugger Robot
2e0648a758 Merge "Bump CtsNetTestCasesLatestSdk to target SDK 30." into rvc-dev am: d69d28f755 am: 6c56cf06e3 am: 3d5228c19d am: eff4bb36ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11850382

Change-Id: I2c78a6eb6b2511f026af622f64b7c7c5246291ba
2020-06-15 12:16:33 +00:00
TreeHugger Robot
eff4bb36ab Merge "Bump CtsNetTestCasesLatestSdk to target SDK 30." into rvc-dev am: d69d28f755 am: 6c56cf06e3 am: 3d5228c19d
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11850382

Change-Id: I2b2853be306c9b761e93fa41094fd1e849e26335
2020-06-15 12:04:01 +00:00
TreeHugger Robot
b857d32541 Merge "Bump CtsNetTestCasesLatestSdk to target SDK 30." into rvc-dev am: d69d28f755 am: 6c56cf06e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11850382

Change-Id: I695a84987cea13bf59b2ff8cce98ae7874f6b92a
2020-06-15 11:50:55 +00:00
TreeHugger Robot
9ba6fb6829 Merge "Bump CtsNetTestCasesLatestSdk to target SDK 30." into rvc-dev am: d69d28f755 am: 9daa97c7d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11850382

Change-Id: I6e2482bc0b5ff958e72d78af33a2e54e77847d8e
2020-06-15 11:50:34 +00:00
Treehugger Robot
3abe36567c Fix CtsTetheringTest on devices without permanent softAp interfaces.
Normally stop wifi tethering flow would be:
Tethering#stopTethering -> WifiManager#stopSoftAp -> softAp disabled,
then have WIIF_AP_STATE_CHANGED intent -> stop IpServer and broadcast
TETHER_STATE_CHANGED intent. SoftAp is disabled before tethering stop.

Because tethering would shutdown the corresponding IpServer if it
observed the interface is removed. For those devices that softAp
interface would be removed when stop tethering, the flow may be
Tethering#stopTethering -> WifiManager#stopSoftAp -> softAp disabing,
softAp interface is removed -> tethering trigger stop IpServer and
broadcast TETHER_STATE_CHANGED intent -> -> softAp disabled, then wifi
broadcast WIIF_AP_STATE_CHANGED intent. In this case, tethering is
stopped ready before softap is disabled.
For this case, CtsTeteringTest would have race between two test cases.
If two case need to start wifi tethering for testing and stop wifi
tethering after finish testing.
The second test may suffer from startTethering fail problem due to
softAP is not disabled yet.
    E WifiService: Tethering is already active.

Bug: 157806780
Test: atest CtsTetheringTest

Original-Change: https://android-review.googlesource.com/1331096
Merged-In: I0ba6bc9dcbf7829dcad5561c707d5f5c5540f10b
Change-Id: I0ba6bc9dcbf7829dcad5561c707d5f5c5540f10b
2020-06-15 11:30:50 +00:00
TreeHugger Robot
9daa97c7d6 Merge "Bump CtsNetTestCasesLatestSdk to target SDK 30." into rvc-dev am: d69d28f755
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11850382

Change-Id: Ifcf2a6cc2ad2a5573a92aa936d17cb6518b61277
2020-06-15 11:25:23 +00:00
TreeHugger Robot
6c56cf06e3 Merge "Bump CtsNetTestCasesLatestSdk to target SDK 30." into rvc-dev am: d69d28f755
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11850382

Change-Id: Ia2411bfd6cf06012f9adcfd6294188ff79be1421
2020-06-15 11:25:10 +00:00
Lorenzo Colitti
53430127ec Bump CtsNetTestCasesLatestSdk to target SDK 30.
This is not necessary for the tests to be able to use APIs
introduced in R because they can already access hidden APIs.
But it is important to ensure that they are subject to whatever
new system behaviour is applied to SDK 30 apps.

Fix: 158839774
Test: treehugger
Test: atest CtsNetTestCasesLatestSdk has no new failures
Change-Id: Ic86fe84b28b5becc722903650f00e9ca7d6e5f3f
2020-06-15 11:24:02 +00:00
Treehugger Robot
42b94813bd Merge "Fix CtsTetheringTest on devices without permanent softAp interfaces." am: 10f23078c1 am: 9d3ae2e188 am: 174f529ce4 am: d55432238a am: f5a50c1258
Original change: https://android-review.googlesource.com/c/platform/cts/+/1331096

Change-Id: I73d245ed8c3fc58462a082ecf0852bf28539ac17
2020-06-15 11:03:36 +00:00
Treehugger Robot
f5a50c1258 Merge "Fix CtsTetheringTest on devices without permanent softAp interfaces." am: 10f23078c1 am: 9d3ae2e188 am: 174f529ce4 am: d55432238a
Original change: https://android-review.googlesource.com/c/platform/cts/+/1331096

Change-Id: Id61671147cf73111fd2ba239802cd4eb06aa9e1a
2020-06-15 10:50:26 +00:00
Treehugger Robot
d55432238a Merge "Fix CtsTetheringTest on devices without permanent softAp interfaces." am: 10f23078c1 am: 9d3ae2e188 am: 174f529ce4
Original change: https://android-review.googlesource.com/c/platform/cts/+/1331096

Change-Id: Ie138b7e5465bcd19b7804588c3068a6a3ab0ea1e
2020-06-15 10:37:02 +00:00
Treehugger Robot
174f529ce4 Merge "Fix CtsTetheringTest on devices without permanent softAp interfaces." am: 10f23078c1 am: 9d3ae2e188
Original change: https://android-review.googlesource.com/c/platform/cts/+/1331096

Change-Id: I0eb4c872456981e346d95d57bc2e69cc327342bf
2020-06-15 10:18:21 +00:00
Treehugger Robot
9d3ae2e188 Merge "Fix CtsTetheringTest on devices without permanent softAp interfaces." am: 10f23078c1
Original change: https://android-review.googlesource.com/c/platform/cts/+/1331096

Change-Id: I77c08e18837bd0d04744c4dd5b058c368e90f85d
2020-06-15 10:06:52 +00:00
Treehugger Robot
10f23078c1 Merge "Fix CtsTetheringTest on devices without permanent softAp interfaces." 2020-06-15 09:49:44 +00:00
markchien
24d8b8391e Fix CtsTetheringTest on devices without permanent softAp interfaces.
Normally stop wifi tethering flow would be:
Tethering#stopTethering -> WifiManager#stopSoftAp -> softAp disabled,
then have WIIF_AP_STATE_CHANGED intent -> stop IpServer and broadcast
TETHER_STATE_CHANGED intent. SoftAp is disabled before tethering stop.

Because tethering would shutdown the corresponding IpServer if it
observed the interface is removed. For those devices that softAp
interface would be removed when stop tethering, the flow may be
Tethering#stopTethering -> WifiManager#stopSoftAp -> softAp disabing,
softAp interface is removed -> tethering trigger stop IpServer and
broadcast TETHER_STATE_CHANGED intent -> -> softAp disabled, then wifi
broadcast WIIF_AP_STATE_CHANGED intent. In this case, tethering is
stopped ready before softap is disabled.
For this case, CtsTeteringTest would have race between two test cases.
If two case need to start wifi tethering for testing and stop wifi
tethering after finish testing.
The second test may suffer from startTethering fail problem due to
softAP is not disabled yet.
    E WifiService: Tethering is already active.

Bug: 157806780
Test: atest CtsTetheringTest

Change-Id: I0ba6bc9dcbf7829dcad5561c707d5f5c5540f10b
2020-06-15 13:42:40 +08:00
Treehugger Robot
895bb45b22 [automerger skipped] Fix MultinetworkApiTest fail problem in instant mode am: 791d142a98 -s ours am: 6eb4e0e759 -s ours am: 7d3fca77e0 -s ours am: 913c04a6d5 -s ours
am skip reason: Change-Id I8ecadd134824a4023a3c6e173d52ba088d46b103 with SHA-1 23710588f9 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11823248

Change-Id: I91c5ee245f02e18e86846a6b5028534db232de12
2020-06-11 04:52:47 +00:00
Treehugger Robot
36eea6703e [automerger skipped] Fix MultinetworkApiTest fail problem in instant mode am: 791d142a98 am: 750eee8756 -s ours am: f47880373f -s ours am: 39acd6f7f7 -s ours
am skip reason: Change-Id I8ecadd134824a4023a3c6e173d52ba088d46b103 with SHA-1 23710588f9 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11823248

Change-Id: Ifd6f2570f2f3baeab1c0109735bc02a04f33cb4f
2020-06-11 04:52:25 +00:00
Treehugger Robot
913c04a6d5 [automerger skipped] Fix MultinetworkApiTest fail problem in instant mode am: 791d142a98 -s ours am: 6eb4e0e759 -s ours am: 7d3fca77e0 -s ours
am skip reason: Change-Id I8ecadd134824a4023a3c6e173d52ba088d46b103 with SHA-1 23710588f9 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11823248

Change-Id: I19c383a57fb3cee5a65b9ae6670ed4eb54e5ea03
2020-06-11 04:39:53 +00:00
Treehugger Robot
39acd6f7f7 [automerger skipped] Fix MultinetworkApiTest fail problem in instant mode am: 791d142a98 am: 750eee8756 -s ours am: f47880373f -s ours
am skip reason: Change-Id I8ecadd134824a4023a3c6e173d52ba088d46b103 with SHA-1 23710588f9 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11823248

Change-Id: I298bbb441dd4923ff6413f3cd120f7245fca2c99
2020-06-11 04:39:34 +00:00
Treehugger Robot
7d3fca77e0 [automerger skipped] Fix MultinetworkApiTest fail problem in instant mode am: 791d142a98 -s ours am: 6eb4e0e759 -s ours
am skip reason: Change-Id I8ecadd134824a4023a3c6e173d52ba088d46b103 with SHA-1 23710588f9 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11823248

Change-Id: I6e649c287e5b6ccde175b7a51335fd709631afdc
2020-06-11 04:27:20 +00:00
Treehugger Robot
f47880373f [automerger skipped] Fix MultinetworkApiTest fail problem in instant mode am: 791d142a98 am: 750eee8756 -s ours
am skip reason: Change-Id I8ecadd134824a4023a3c6e173d52ba088d46b103 with SHA-1 23710588f9 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11823248

Change-Id: Ibc1d1673fa7c169da4df01d598b171c0350c7add
2020-06-11 04:26:57 +00:00
Treehugger Robot
750eee8756 Fix MultinetworkApiTest fail problem in instant mode am: 791d142a98
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11823248

Change-Id: Icd1c55fe090d77a2045adb1d00d38cfc0bc86212
2020-06-11 04:05:12 +00:00
Treehugger Robot
6eb4e0e759 [automerger skipped] Fix MultinetworkApiTest fail problem in instant mode am: 791d142a98 -s ours
am skip reason: Change-Id I8ecadd134824a4023a3c6e173d52ba088d46b103 with SHA-1 23710588f9 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11823248

Change-Id: I5e620b4ed80b70b61120528dd42146befe86e86b
2020-06-11 04:05:12 +00:00
Treehugger Robot
791d142a98 Fix MultinetworkApiTest fail problem in instant mode
CtsNetUtils#storePrivateDnsSetting might require WRITE_SECURE_SETTINGS
permission to run.
Therefore, move it from setUp to only belong to the required test case.

Bug: 158538281
Test: run cts --include-filter "arm64-v8a CtsNetTestCases[instant]
android.net.cts.MultinetworkApiTest"

Merged-In: I8ecadd134824a4023a3c6e173d52ba088d46b103
Change-Id: Ic8fa1421b1092efdb011a124836d9f466a231f43
(cherry picked from commit 9451fdf5031d2de02ac9011696b56760ea4943a0)
2020-06-11 02:37:41 +00:00