Commit Graph

3228 Commits

Author SHA1 Message Date
markchien
2082597684 [automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into pie-cts-dev am: ffaed0bbc0 -s ours am: 257e3faca3 -s ours
am: 6591499e44 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history

Change-Id: Ief035b800d86e2e08af9f8488c4468f47b253071
2019-08-16 10:47:49 -07:00
markchien
6591499e44 [automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into pie-cts-dev am: ffaed0bbc0 -s ours
am: 257e3faca3 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history

Change-Id: I0a3f9ee8bfb0a20aefbed1eecdbdf95ff782c67d
2019-08-16 10:39:20 -07:00
markchien
257e3faca3 [automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into pie-cts-dev
am: ffaed0bbc0 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history

Change-Id: I513c89fadd93716b099f2b21f44ae47fb70516ec
2019-08-16 10:29:51 -07:00
markchien
52b82e3312 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: 117194347
Test: - I solemnly swear I tested this conflict resolution
Change-Id: I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629
Merged-In: I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629
(cherry picked from commit de0f268f78)
2019-08-09 12:45:45 +00:00
Remi NGUYEN VAN
9c97c58656 Add test for WifiInfo#getFrequency()
Add getFrequency() to WifiInfoTest (along with other missing getters),
and test that it is consistent with ScanResult in ScanResultTest.

Test: atest android.net.wifi.cts.ScanResultTest
Fixes: b/138929469
Merged-In: I070b16661bc72a5c5035b0b227821b680d7d71ba
(cherry picked from commit 2d504956e63eefb0a6a90844d1d00b99c097891b)

Change-Id: Ie99011acbbe66e9088f73964fd0c39d640594011
2019-08-09 03:24:49 +00:00
Mark Chien
6fe647716f [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: e6bf3b799e -s ours
am: 2c5ac01165 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history

Change-Id: I1d24f04eaeb01f72b7448688a6c63c359f1a97c8
2019-07-31 21:23:23 -07:00
Mark Chien
2c5ac01165 [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: e6bf3b799e -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history

Change-Id: I57a24748b4bb6abaa50a9ff43fffb235ce54d6c1
2019-07-31 21:11:24 -07:00
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
junyulai
f8f32911db [automerger skipped] Merge "Resolve resource ID at runtime to stabilize tests" into qt-dev
am: 288024db11 -s ours
am skip reason: change_id Ic44b31ed9acc48b9bcba7e1e70cc18a65bc0a8f6 with SHA1 5764173a9f is in history

Change-Id: Ie2fec5bdde1a7c3bf7fced8ca28bd30493cf3374
2019-07-10 14:56:06 -07:00
TreeHugger Robot
288024db11 Merge "Resolve resource ID at runtime to stabilize tests" into qt-dev 2019-07-10 21:39:17 +00:00
Lorenzo Colitti
06f11f519f [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: ac180af96d -s ours
am: 318b0296dd -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history

Change-Id: Ic1bd0bc8ca4972739af578e6e8f305a9fc111e63
2019-07-08 13:34:39 -07:00
Lorenzo Colitti
318b0296dd [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: ac180af96d -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history

Change-Id: Ieb4935ff494284c71dd7e7bc186076745a563606
2019-07-08 13:22:39 -07: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
junyulai
148f2bb39d Resolve resource ID at runtime to stabilize tests
This change also remove some unused references.

Bug: 136638851
Test: atest android.net.cts.ConnectivityManagerTest

Merged-In: Ic44b31ed9acc48b9bcba7e1e70cc18a65bc0a8f6
Change-Id: Ic44b31ed9acc48b9bcba7e1e70cc18a65bc0a8f6
(cherry-pick from ag/8500407)
2019-07-05 09:50:38 +00:00
Junyu Lai
e5cca4e40e Merge "Resolve resource ID at runtime to stabilize tests" into qt-r1-dev 2019-07-05 07:24:16 +00:00
junyulai
5764173a9f Resolve resource ID at runtime to stabilize tests
This change also remove some unused references.

Bug: 136638851
Test: atest android.net.cts.ConnectivityManagerTest

Change-Id: Ic44b31ed9acc48b9bcba7e1e70cc18a65bc0a8f6
2019-07-05 10:29:04 +08: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
70808176ce 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: f090f3de05 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history

Change-Id: I79f36a32d6415390ddfce6eacce3bffca3d7c11e
2019-06-27 09:34:22 -07: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
21830f0f86 [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: cdef8b40ad -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 de0f268f78 is in history

Change-Id: I3bd1878cdc5b94797309928d150deb1accb9059c
2019-06-27 09:20:37 -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
Junyu Lai
2419976be4 Add CTS for creating keepalive offloads on cellular
Bug: 134352656
Test: atest android.net.cts.ConnectivityManagerTest (--instant)
Merged-In: Ia7b1111abe687efad032a8c9205990c97a769fcd
Change-Id: Ib6b01356d785c5b7684520eef9f9d1fe48187582
(cherry picked from commit 8550488c7cf0c0ab2af06189aca5ad50c39e5276)
2019-06-20 02:22:23 +00:00
Sudheer Shanka
aa42c35fac [automerger skipped] Merge "Skip battery saver related tests on unsupported devices." into pie-cts-dev am: e3c9363b92
am: 14586e59ae -s ours
am skip reason: change_id Ifec84425febf38d732367fae6b43fa80c427c79f with SHA1 802549c8de is in history

Change-Id: Ifb8f628a98a57a5845c476f29775b1bc4ec5a31a
2019-06-19 11:58:29 -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