Commit Graph

3509 Commits

Author SHA1 Message Date
Junyu Lai
a57c0f01d4 Merge "Resolve resource ID at runtime to stabilize tests" into qt-r1-dev am: e5cca4e40e
am: 0632e3aa67

Change-Id: I19a3d6008fae225ab3ba933cad5e2622c3861eb9
2019-07-05 08:33:05 -07:00
Junyu Lai
0632e3aa67 Merge "Resolve resource ID at runtime to stabilize tests" into qt-r1-dev
am: e5cca4e40e

Change-Id: Iffa441670cb2ab0b014cf26402d7a0fc040da31b
2019-07-05 07:48:55 -07: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
Xin Li
f69f58136c [automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 734abbe367 -s ours am: 8e4484271a
am: 3ad76b492c -s ours
am skip reason: subject contains skip directive

Change-Id: I43b266924593ea4c0ab47cba4645a805f9fb558e
2019-07-02 12:48:27 -07:00
Xin Li
3ad76b492c [automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 734abbe367 -s ours
am: 8e4484271a

Change-Id: I71068fb89f31508e37a2534f04734140c045ff26
2019-07-02 11:34:27 -07:00
Xin Li
734abbe367 DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
Bug: 134405016
Change-Id: I284a8e309f3a2ada92ffae93c26b0ef00ed72dac
2019-07-01 20:58:37 +00:00
markchien
acedea85cf 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: 70808176ce -s ours am: 107b7aadfd -s ours
am: f11c87d460 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history

Change-Id: I9189f29db749b171c19ecf2e8c68be8209205c9f
2019-06-27 14:00:27 -07:00
markchien
db8e7becc3 [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: 21830f0f86 -s ours am: b4673d4279 -s ours
am: 1d1a939cda -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 de0f268f78 is in history

Change-Id: Ibbfcffacf8bb0bbb90bbb86e57120cf9ae4d49ff
2019-06-27 13:51:10 -07:00
markchien
f11c87d460 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: 70808176ce -s ours
am: 107b7aadfd -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history

Change-Id: I22a52c580b9507e2640c49a1091331babf184df4
2019-06-27 10:57:31 -07:00
markchien
1d1a939cda [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: 21830f0f86 -s ours
am: b4673d4279 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 de0f268f78 is in history

Change-Id: I0d3a7cd798275df5909736abffeb5213cbbc42b1
2019-06-27 10:45:51 -07:00
markchien
107b7aadfd 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: 70808176ce -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history

Change-Id: I7c8d679fa0ac52ef4a75bbf74c725c76e6beab58
2019-06-27 09:55:06 -07:00
markchien
b4673d4279 [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: 21830f0f86 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 de0f268f78 is in history

Change-Id: I721587d2833fa81c099775175efb4a5f9d9510f4
2019-06-27 09:36:58 -07: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
Pete Bentley
e3185d0df0 Merge "Fix regression tests for SSLCertificateSocketFactoryTest hostname verification." am: 62ec101de4 am: 503cbe8f8c am: 465611b72f
am: cf8f97b3b7

Change-Id: I3235d7b3bcbeef7d19e7fc1502ecf5e011b308f3
2019-06-25 08:37:49 -07:00
Pete Bentley
cf8f97b3b7 Merge "Fix regression tests for SSLCertificateSocketFactoryTest hostname verification." am: 62ec101de4 am: 503cbe8f8c
am: 465611b72f

Change-Id: Ifef002dd13da5712c8a8c4d22388cc25ecc54709
2019-06-25 08:17:25 -07:00
Pete Bentley
465611b72f Merge "Fix regression tests for SSLCertificateSocketFactoryTest hostname verification." am: 62ec101de4
am: 503cbe8f8c

Change-Id: I98414de38201df779c27a37efbb73a153b09b0d6
2019-06-25 08:02:24 -07:00
Pete Bentley
62ec101de4 Merge "Fix regression tests for SSLCertificateSocketFactoryTest hostname verification." 2019-06-25 14:13:43 +00:00
Julien Desprez
6ce84a161b [automerger skipped] Merge "[Cherry pick] Mark module as "secondary_user" since it uncovered bug before" am: 9c9dde65ba am: d30bab3710 am: 7b48d84ed5
am: 5cab049c08 -s ours
am skip reason: change_id Ic8af2e3e77e24db340b2894c2d36e3501962952c with SHA1 bd43e6d4fb is in history

Change-Id: I01cce82ba62959e794abcb283a0b7f77a4c4f09f
2019-06-25 01:15:58 -07:00
Julien Desprez
5cab049c08 Merge "[Cherry pick] Mark module as "secondary_user" since it uncovered bug before" am: 9c9dde65ba am: d30bab3710
am: 7b48d84ed5

Change-Id: I196ad1e84d97a5593ae768aeb74915a40894fb99
2019-06-25 01:08:45 -07:00
Julien Desprez
7b48d84ed5 Merge "[Cherry pick] Mark module as "secondary_user" since it uncovered bug before" am: 9c9dde65ba
am: d30bab3710

Change-Id: I86f7186964eb9dd70cd7b442768095fc806afb7a
2019-06-25 01:00:59 -07:00
Julien Desprez
14fae15d0a [Cherry pick] Mark module as "secondary_user" since it uncovered bug before
This will allow running this module against a secondary
user in continuous infra to uncover bugs.

Test: run cts-unit-tests
Bug: 130892086
Change-Id: I063a0d29163567ec2cf97d2e4469e88e7203e852
Merged-In: Ic8af2e3e77e24db340b2894c2d36e3501962952c
2019-06-24 09:15:51 -07:00
Pete Bentley
331856df7d Fix regression tests for SSLCertificateSocketFactoryTest hostname verification.
No longer relies on a server with a known bad TLS certificate, instead
connects to a known good server but installs a HostnameVerifier which
rejects all hostnames in order to test that verification is taking place
where expected.

Bug: 2807618
Bug: 134532880
Test: atest CtsNetTestCases
Test: atest CtsNetTestCases --instant
Change-Id: I7608047a75555296153459a45747ee83ec87db4b
2019-06-24 15:27:42 +01:00
Pete Bentley
6de81ed7b0 Merge "Update test host used for TLS host verification." am: 29ec721673 am: 776e73a67c am: 48849843db
am: 029d004113

Change-Id: I454389f54d4b172881eb6de3fe7e445a63fd3e95
2019-06-20 10:50:56 -07:00
Pete Bentley
029d004113 Merge "Update test host used for TLS host verification." am: 29ec721673 am: 776e73a67c
am: 48849843db

Change-Id: I9cced1f2636ac8009d99dac901c899ec918cd6ab
2019-06-20 10:40:24 -07:00
Pete Bentley
48849843db Merge "Update test host used for TLS host verification." am: 29ec721673
am: 776e73a67c

Change-Id: Icfeb40d166addc1827cc6f3823888c2bdaa012dd
2019-06-20 10:00:26 -07:00
Junyu Lai
d0ff85c421 [automerger skipped] Add CTS for creating keepalive offloads on cellular am: 2419976be4 -s ours am: ef3b6d4640 -s ours
am: 3e70f8181a -s ours
am skip reason: change_id Ia7b1111abe687efad032a8c9205990c97a769fcd with SHA1 487b0401c0 is in history

Change-Id: Ia416790500af31de720640e24e5600b004c5200c
2019-06-20 09:13:02 -07:00
Pete Bentley
29ec721673 Merge "Update test host used for TLS host verification." 2019-06-20 12:27:27 +00:00
Junyu Lai
3e70f8181a [automerger skipped] Add CTS for creating keepalive offloads on cellular am: 2419976be4 -s ours
am: ef3b6d4640 -s ours
am skip reason: change_id Ia7b1111abe687efad032a8c9205990c97a769fcd with SHA1 487b0401c0 is in history

Change-Id: Iad6b89c9d5e6fd30fcefbabe923b49e5f821dd09
2019-06-19 23:17:37 -07:00
Junyu Lai
ef3b6d4640 [automerger skipped] Add CTS for creating keepalive offloads on cellular
am: 2419976be4 -s ours
am skip reason: change_id Ia7b1111abe687efad032a8c9205990c97a769fcd with SHA1 487b0401c0 is in history

Change-Id: I13acb44663576e3237646877bb1f71e0d48c6914
2019-06-19 22:51:58 -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
TreeHugger Robot
dde0391030 Merge "Mark module as "secondary_user" since it uncovered bug before" 2019-06-19 23:55:33 +00:00
Julien Desprez
bd43e6d4fb Mark module as "secondary_user" since it uncovered bug before
This will allow running this module against a secondary
user in continuous infra to uncover bugs.

Test: run cts-unit-tests
Bug: 130892086
Change-Id: Ic8af2e3e77e24db340b2894c2d36e3501962952c
2019-06-19 15:25:08 -07:00
Sudheer Shanka
efc4a0f317 [automerger skipped] Merge "Skip battery saver related tests on unsupported devices." into pie-cts-dev am: e3c9363b92 am: 14586e59ae -s ours am: aa42c35fac -s ours am: f491acd9df -s ours
am: bf80eece94 -s ours
am skip reason: change_id Ifec84425febf38d732367fae6b43fa80c427c79f with SHA1 802549c8de is in history

Change-Id: I3b543f33314273516ff68695e8e08802929ea0be
2019-06-19 12:54:02 -07:00
Sudheer Shanka
bd5c86eec4 [automerger skipped] Merge "Skip battery saver related tests on unsupported devices." into pie-cts-dev am: e3c9363b92 am: 14586e59ae -s ours am: aa42c35fac -s ours am: 7ea6de2788 -s ours
am: 036c26ee3d -s ours
am skip reason: change_id Ifec84425febf38d732367fae6b43fa80c427c79f with SHA1 802549c8de is in history

Change-Id: Iabba8b86193dbd3a315d4a8fe35f84e36bb15973
2019-06-19 12:33:44 -07:00
Sudheer Shanka
bf80eece94 [automerger skipped] Merge "Skip battery saver related tests on unsupported devices." into pie-cts-dev am: e3c9363b92 am: 14586e59ae -s ours am: aa42c35fac -s ours
am: f491acd9df -s ours
am skip reason: change_id Ifec84425febf38d732367fae6b43fa80c427c79f with SHA1 802549c8de is in history

Change-Id: I7c52fe72414d9ab7887b5be0b142830a3002f7fc
2019-06-19 12:32:51 -07:00
Sudheer Shanka
036c26ee3d [automerger skipped] Merge "Skip battery saver related tests on unsupported devices." into pie-cts-dev am: e3c9363b92 am: 14586e59ae -s ours am: aa42c35fac -s ours
am: 7ea6de2788 -s ours
am skip reason: change_id Ifec84425febf38d732367fae6b43fa80c427c79f with SHA1 802549c8de is in history

Change-Id: I1adea7d4a1e2f853989647add70b81c1b83f5018
2019-06-19 12:20:42 -07:00
Sudheer Shanka
f491acd9df [automerger skipped] Merge "Skip battery saver related tests on unsupported devices." into pie-cts-dev am: e3c9363b92 am: 14586e59ae -s ours
am: aa42c35fac -s ours
am skip reason: change_id Ifec84425febf38d732367fae6b43fa80c427c79f with SHA1 802549c8de is in history

Change-Id: I88f0609f13b01ebd0bb63febc024139df28b8512
2019-06-19 12:09:55 -07: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
Junyu Lai
ed1cdfc280 Merge "Add CTS for creating keepalive offloads on cellular" am: 16174b2cff am: e849a96874 am: eb76123add
am: aeef4e5efa

Change-Id: I486006e11e22ab75864587e50c647331735f951c
2019-06-19 07:44:30 -07:00