Commit Graph

2623 Commits

Author SHA1 Message Date
Mark Chien
e6bf3b799e [automerger skipped] Merge changes from topic "am-6bf6d04b-31af-4d11-9286-c78baea6dc7f" into oc-dev am: 704a9a46d8 -s ours am: ecaabe8f3e -s ours
am: 9b319aa0ef -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history

Change-Id: Ia0a4c5b6dacdb18ddfeead56ebbc9d5d843f9a3d
2019-07-31 20:46:59 -07:00
Mark Chien
9b319aa0ef [automerger skipped] Merge changes from topic "am-6bf6d04b-31af-4d11-9286-c78baea6dc7f" into oc-dev am: 704a9a46d8 -s ours
am: ecaabe8f3e -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history

Change-Id: I8f7399472b3060ad1c2a2c22e534855d8ed15486
2019-07-31 20:34:15 -07:00
Mark Chien
ecaabe8f3e [automerger skipped] Merge changes from topic "am-6bf6d04b-31af-4d11-9286-c78baea6dc7f" into oc-dev
am: 704a9a46d8 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history

Change-Id: If59203a033c02f870646db01d5f15029ffc8ac5c
2019-07-31 20:22:14 -07:00
Android Build Merger (Role)
13a268e886 [automerger] Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3 am: c4031da617 am: 1635ad610f am: 21e123fdf6 am: 9ee527d848 skipped: ca53691112
Change-Id: I6ac7579f1b95830997c573afa5f0241161c7c0ed
2019-07-29 02:08:46 +00:00
Android Build Merger (Role)
ca53691112 [automerger] Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3 am: c4031da617 am: 1635ad610f am: 21e123fdf6 am: 9ee527d848
Change-Id: I26195a3e5bc6146eedc178830055633d115a5c24
2019-07-29 02:07:59 +00:00
Android Build Merger (Role)
9ee527d848 [automerger] Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3 am: c4031da617 am: 1635ad610f am: 21e123fdf6
Change-Id: Ie7fd5c786de0da298e2a2a3dd34ad5d5d4dab98d
2019-07-29 02:07:54 +00:00
Android Build Merger (Role)
21e123fdf6 [automerger] Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3 am: c4031da617 am: 1635ad610f
Change-Id: Idd42f33615f8e2e08cd60082d805bf85ff6be4d0
2019-07-29 02:07:48 +00:00
Android Build Merger (Role)
1635ad610f [automerger] Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3 am: c4031da617
Change-Id: Ib59590b6ec8012bd56dc02fd485ffb5a693dd38f
2019-07-29 02:07:39 +00:00
markchien
c4031da617 Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev
am: 873f2d8aa3

Change-Id: Ic968bb8f93e3471b9b5b47d336752957b23ce16b
2019-07-26 09:50:47 -07:00
markchien
dd32bb52f7 Exempt adb socket for hostside VpnTest
Vpn test would destroy socket. If adb run over network, adb
socket would be killed during Vpn test. Then, test stop due to
adb disconnect.

Bug: 119382723
Bug: 135225500
Bug: 126645908
Test: Just cherry-pick with conflict fix

Change-Id: I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629
Merged-In: I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629
Merged-In: Id6f986aacc3cadf713ebbc8305ca535b861390fc
(cherry picked from commit de0f268f78)
2019-07-18 12:43:04 +00:00
Lorenzo Colitti
ac180af96d [automerger skipped] [automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c am: cbc0a6b066 am: c7ec3629b4 am: 047d1a9ed5 am: 8e99f9ef76 am: e386847db3 am: 5530604a47 am: 7dc43d91c4 am: d66e639f31 -s ours am: c37cc1e4f1 -s ours
am: 6b43dd2a19 -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history

Change-Id: I60f7d208ec780c241b674b78b656eec1781b768c
2019-07-08 13:12:36 -07:00
Lorenzo Colitti
6b43dd2a19 [automerger skipped] [automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c am: cbc0a6b066 am: c7ec3629b4 am: 047d1a9ed5 am: 8e99f9ef76 am: e386847db3 am: 5530604a47 am: 7dc43d91c4 am: d66e639f31 -s ours
am: c37cc1e4f1 -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history

Change-Id: Ie1bb4a36b1e572bfccf1c9e074835cbc1c9a464d
2019-07-08 12:57:09 -07:00
Lorenzo Colitti
c37cc1e4f1 [automerger skipped] [automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c am: cbc0a6b066 am: c7ec3629b4 am: 047d1a9ed5 am: 8e99f9ef76 am: e386847db3 am: 5530604a47 am: 7dc43d91c4
am: d66e639f31 -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history

Change-Id: I74cbd632b1a20501cfead409b87632adb1acc339
2019-07-08 12:43:04 -07:00
Android Build Merger (Role)
d66e639f31 [automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c am: cbc0a6b066 am: c7ec3629b4 am: 047d1a9ed5 am: 8e99f9ef76 am: e386847db3 am: 5530604a47 am: 7dc43d91c4
Change-Id: I428b1ee7884c4177062279b5fb600c9fc239bee5
2019-07-08 19:24:16 +00:00
Android Build Merger (Role)
7dc43d91c4 [automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c am: cbc0a6b066 am: c7ec3629b4 am: 047d1a9ed5 am: 8e99f9ef76 am: e386847db3 am: 5530604a47
Change-Id: I9914b8be6955431a5f2340716d018d236f709dd1
2019-07-08 19:24:10 +00:00
Android Build Merger (Role)
5530604a47 [automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c am: cbc0a6b066 am: c7ec3629b4 am: 047d1a9ed5 am: 8e99f9ef76 am: e386847db3
Change-Id: Ia7b615ad33acdcee358ceaa5a424e4bfff155998
2019-07-08 19:24:06 +00:00
Android Build Merger (Role)
e386847db3 [automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c am: cbc0a6b066 am: c7ec3629b4 am: 047d1a9ed5 am: 8e99f9ef76
Change-Id: If285f192d8078cd4934e6700b3b6a535185f1b53
2019-07-08 19:23:59 +00:00
Android Build Merger (Role)
8e99f9ef76 [automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c am: cbc0a6b066 am: c7ec3629b4 am: 047d1a9ed5
Change-Id: I03f5b6a01337158727e56ad60a79d9f2a87daf7e
2019-07-08 19:23:55 +00:00
Android Build Merger (Role)
047d1a9ed5 [automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c am: cbc0a6b066 am: c7ec3629b4
Change-Id: I0669f124ad6d84592053ac199c7fd1831fb8f7d3
2019-07-08 19:23:50 +00:00
Android Build Merger (Role)
cbc0a6b066 [automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c
Change-Id: I3611dbe31a1c1d42c22549e065dce570e97bada3
2019-07-08 19:23:45 +00:00
Lorenzo Colitti
e6ced2f716 Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev
am: dd55552460

Change-Id: I6f2775a58f5c72effd7d04e031abb61df569dbb3
2019-07-08 12:23:07 -07:00
Treehugger Robot
dd55552460 Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev 2019-07-08 18:39:08 +00:00
Lorenzo Colitti
86d07d0147 Fix expected reverse lookup of Google DNS IP addresses
DnsTest.testDnsWorks expects that reverse lookup for the Google
public DNS servers will return something with google.com in the
name. This no longer works because the reverse DNS entries have
changed to dns.google.

Bug: 129452237
Test: atest android.net.cts.DnsTest.testDnsWorks
Change-Id: Iee8bfe418bf6003e5c78df77d75f6f9745249267
Merged-In: Iee8bfe418bf6003e5c78df77d75f6f9745249267
(cherry picked from commit 3852fd92f5)
2019-07-03 13:47:01 +09:00
markchien
f090f3de05 Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b -s ours am: 956b28af13 -s ours
am: b8b8d703d9 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history

Change-Id: Ic9514c32f1e0c6e9565b114f98f02cb4c97d35b7
2019-06-27 09:25:11 -07:00
markchien
b8b8d703d9 Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b -s ours
am: 956b28af13 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history

Change-Id: I47ea61fd0bdc9c2b4fe080e29550b5fc0d2c1b38
2019-06-27 09:14:58 -07:00
markchien
cdef8b40ad [automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b am: 04118c8a30 am: caee99b3cf -s ours
am: 5ecbd991d5 -s ours
am skip reason: change_id Id6f986aacc3cadf713ebbc8305ca535b861390fc with SHA1 b84038696c is in history

Change-Id: I338e250514cd7b7c94d9eee24ce4ce738e000366
2019-06-27 09:06:08 -07:00
markchien
5ecbd991d5 [automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b am: 04118c8a30
am: caee99b3cf -s ours
am skip reason: change_id Id6f986aacc3cadf713ebbc8305ca535b861390fc with SHA1 b84038696c is in history

Change-Id: I216e490624ce14e2b4dacff9381a7d8c96276349
2019-06-27 08:56:58 -07:00
Android Merger
956b28af13 Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b -s ours am skip reason: change_id Id6f986aacc3cadf713ebbc8305ca535b861390fc with SHA1 b84038696c is in history" into oreo-mr1-cts-dev 2019-06-27 15:51:06 +00:00
markchien
1547ce9dfa [automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev
am: 0ff953bf1b -s ours
am skip reason: change_id Id6f986aacc3cadf713ebbc8305ca535b861390fc with SHA1 b84038696c is in history

Change-Id: Ia65a5ed54dd61a36d9f0f22fe2eae518c373230c
2019-06-27 08:50:57 -07:00
markchien
caee99b3cf Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b
am: 04118c8a30

Change-Id: Ic76572a2585a338f8c08b473455031ef25c562c1
2019-06-26 21:37:47 -07:00
markchien
04118c8a30 Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev
am: 0ff953bf1b

Change-Id: I94e8de44713f076783073371cca65c4b5579220e
2019-06-26 21:17:51 -07:00
Sudheer Shanka
14586e59ae Merge "Skip battery saver related tests on unsupported devices." into pie-cts-dev
am: e3c9363b92

Change-Id: Ib587d87add52de4d2e076876edbae7c519eb70ab
2019-06-19 11:44:23 -07:00
markchien
d51ae5760d Exempt adb socket for hostside VpnTest
Vpn test would destroy socket. If adb run over network, adb
socket would be killed during Vpn test. Then, test stop due to
adb disconnect.

Bug: 119382723
Bug: 135225500
Test: - build pass

Change-Id: I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629
Merged-In: I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629
Merged-In: Id6f986aacc3cadf713ebbc8305ca535b861390fc
(cherry picked from commit de0f268f78)
2019-06-19 08:21:00 +00:00
Sudheer Shanka
8371c77499 Skip battery saver related tests on unsupported devices.
Bug: 133761301
Test: atest com.android.cts.net.HostsideRestrictBackgroundNetworkTests
Change-Id: Ifec84425febf38d732367fae6b43fa80c427c79f
Merged-In: Ifec84425febf38d732367fae6b43fa80c427c79f
2019-06-07 10:16:07 -07:00
jovanak
e4c4e3e55a Merge "Fixing NetworkWatchlistTest#testGetWatchlistConfigHash for secondary users." into pie-cts-dev
am: 4e9043b8cf

Change-Id: I0696ee72052294a96d50425284d074dda8ea809a
2019-05-30 13:37:48 -07:00
jovanak
db6336c0b8 Fixing NetworkWatchlistTest#testGetWatchlistConfigHash for secondary users.
Avoids relying on external storage and using the hardcoded /sdcard/ path.
Unrooted adb does not have access to non-user 0 sdcard paths, and so the "cp"
command fails when the test runs in user 10.

Fixes: 121400865
Test: cts-tradefed run cts-dev -m CtsNetTestCases -t android.net.cts.NetworkWatchlistTest#testGetWatchlistConfigHash in user 10.
Change-Id: Idc667072bcfbbe159416fa7c7b6b19045b52041d
2019-05-24 12:21:50 -07:00
Lorenzo Colitti
b54262d012 [automerger skipped] Merge "Merge "Merge "Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc" into oreo-cts-dev am: b6d3940f89" into oreo-mr1-cts-dev am: d93f6d545c" into pie-cts-dev
am: f9b246a320 -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history

Change-Id: Id80d8ca7aa3b52c8edf9c030b28f7ff442b316f7
2019-04-08 20:33:12 -07:00
Lorenzo Colitti
151652e818 [automerger skipped] Merge "Merge "Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc" into oreo-cts-dev am: b6d3940f89" into oreo-mr1-cts-dev am: d93f6d545c -s ours
am: b8e0be9df1 -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history

Change-Id: I7fce20533f0611736019da80ce55ce30398e8370
2019-04-08 20:15:38 -07:00
Lorenzo Colitti
c3f02ab985 [automerger skipped] Merge "Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc" into oreo-cts-dev am: b6d3940f89 -s ours am: c8541fdf00 -s ours am: 255af6675f -s ours
am: 31812cb71a -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history

Change-Id: Id1dd03e1b01dc2744f39934bffafe233658c944a
2019-04-08 20:11:13 -07:00
Lorenzo Colitti
57a0d8740c [automerger skipped] Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc -s ours am: 15f4a80a93 -s ours am: b4583d97e8 -s ours
am: 9fdfe85b32 -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history

Change-Id: I1c0a8f6ede111468f76487ec933efa4c45867db3
2019-04-08 20:06:36 -07:00
Lorenzo Colitti
ea06420fed [automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354 am: d4831efbe0 am: 88a48fcbfe am: 9c3250f49c am: 761b3e5e7b am: e7ee057428 am: bc9edb5254 am: 296cfbb29c
am: 27bbe03b65

Change-Id: Iead4e85a2b5c6f3c54695f21ab1e952fdc7c99c9
2019-04-08 20:01:58 -07:00
Lorenzo Colitti
b8e0be9df1 [automerger skipped] Merge "Merge "Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc" into oreo-cts-dev am: b6d3940f89" into oreo-mr1-cts-dev
am: d93f6d545c -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history

Change-Id: I1e70eb981896dd2382e67771da0da2eeb1168e69
2019-04-08 19:44:08 -07:00
Android Merger
f9b246a320 Merge "Merge "Merge "Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc" into oreo-cts-dev am: b6d3940f89" into oreo-mr1-cts-dev am: d93f6d545c" into pie-cts-dev 2019-04-09 02:38:32 +00:00
Lorenzo Colitti
aaac541459 Merge "Merge "Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc" into oreo-cts-dev am: b6d3940f89" into oreo-mr1-cts-dev
am: d93f6d545c

Change-Id: Ie4a894d0d07dd2f26ef63efbb83a4531110f84aa
2019-04-08 19:38:21 -07:00
Lorenzo Colitti
31812cb71a [automerger skipped] Merge "Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc" into oreo-cts-dev am: b6d3940f89 -s ours am: c8541fdf00 -s ours
am: 255af6675f -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history

Change-Id: Ib784cfed5a3e51d81fd0a731a10ca778a7e6f794
2019-04-08 19:32:33 -07:00
Lorenzo Colitti
9fdfe85b32 [automerger skipped] Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc -s ours am: 15f4a80a93 -s ours
am: b4583d97e8 -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history

Change-Id: Ic896792d6c9a2df2a1bb8611078b69688773a2ae
2019-04-08 19:28:46 -07:00
Lorenzo Colitti
255af6675f [automerger skipped] Merge "Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc" into oreo-cts-dev am: b6d3940f89 -s ours
am: c8541fdf00 -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history

Change-Id: I0a93aa855d17699c81984165eefba942a2ece695
2019-04-08 19:21:24 -07:00
Lorenzo Colitti
b4583d97e8 [automerger skipped] Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc -s ours
am: 15f4a80a93 -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history

Change-Id: Id8fe271de667b3e723703ad48c60db77bc801b35
2019-04-08 19:18:09 -07:00
Lorenzo Colitti
c8541fdf00 [automerger skipped] Merge "Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc" into oreo-cts-dev
am: b6d3940f89 -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history

Change-Id: I63b7048673b9de5a85381372f59c10ba91f78c9b
2019-04-08 19:02:38 -07:00
Lorenzo Colitti
27bbe03b65 [automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354 am: d4831efbe0 am: 88a48fcbfe am: 9c3250f49c am: 761b3e5e7b am: e7ee057428 am: bc9edb5254
am: 296cfbb29c

Change-Id: I254dbd2d33f340c150ea897823c6c0a257da958d
2019-04-08 18:26:32 -07:00