Commit Graph

15738 Commits

Author SHA1 Message Date
Anil Admal
79f9484c6b Merge "VTS 1.1 TestGnssMeasurementCallback test must allow 1.1 or 1.0 versions" into qt-r1-dev
am: f22b39c457

Change-Id: Ic7bd9b309d7e9fe7a2317c4dcba85bd87fa1431f
2019-07-19 11:25:34 -07:00
Anil Admal
f22b39c457 Merge "VTS 1.1 TestGnssMeasurementCallback test must allow 1.1 or 1.0 versions" into qt-r1-dev 2019-07-19 18:12:24 +00:00
Android Build Merger (Role)
6b482e782c Merge changes from topic "am-c5942e1870364b5d8a631c29be850268" into qt-r1-dev-plus-aosp
* changes:
  [automerger skipped] Merge changes from topic "FixSRGBSetColorMode_VTS_qt-dev" into qt-dev am: 818fff840a am: 66f932c583 -s ours am skip reason: change_id Ie8f53effe3e6e29a4523ebfa450c79fdf96ed585 with SHA1 37d1599e0b is in history
  [automerger skipped] DO NOT MERGE: Fixing SRGB for devices that do not support SRGB color mode am: 2f3553e1ed am: c055afc896 -s ours am skip reason: change_id Ie8f53effe3e6e29a4523ebfa450c79fdf96ed585 with SHA1 37d1599e0b is in history
  [automerger skipped] VTS : fix vts fail [1/1] am: 70e5b556ef am: 4818d467d7 -s ours am skip reason: change_id I5eebe5f530e3b62037d669992cf2eca0849f10be with SHA1 0d7f7882e7 is in history
2019-07-19 15:15:30 +00:00
Valerie Hau
14c8e4a59c [automerger skipped] Merge changes from topic "FixSRGBSetColorMode_VTS_qt-dev" into qt-dev am: 818fff840a
am: 66f932c583 -s ours
am skip reason: change_id Ie8f53effe3e6e29a4523ebfa450c79fdf96ed585 with SHA1 37d1599e0b is in history

Change-Id: I9080e758a6a01c78399d8b88982c678f397500dc
2019-07-19 08:15:06 -07:00
Valerie Hau
278d1d780d [automerger skipped] DO NOT MERGE: Fixing SRGB for devices that do not support SRGB color mode am: 2f3553e1ed
am: c055afc896 -s ours
am skip reason: change_id Ie8f53effe3e6e29a4523ebfa450c79fdf96ed585 with SHA1 37d1599e0b is in history

Change-Id: I9fa08273e63339a91107b7dbbda975fbd98d664f
2019-07-19 08:14:57 -07:00
Valerie Hau
1bd5d2520d [automerger skipped] Merge changes from topic "FixSRGBSetColorMode_VTS_qt-dev" into qt-dev am: 818fff840a -s ours
am: 7f42547069 -s ours
am skip reason: change_id Ie8f53effe3e6e29a4523ebfa450c79fdf96ed585 with SHA1 37d1599e0b is in history

Change-Id: I9a94e1ff207c90ba20043e03e54b185057052cc6
2019-07-19 08:14:50 -07:00
jie.yuan
c6aedbfdc2 [automerger skipped] VTS : fix vts fail [1/1] am: 70e5b556ef
am: 4818d467d7 -s ours
am skip reason: change_id I5eebe5f530e3b62037d669992cf2eca0849f10be with SHA1 0d7f7882e7 is in history

Change-Id: I5dfa2cf7c0889e58c175fffa4eb0e3e9007419d0
2019-07-19 08:14:50 -07:00
Valerie Hau
66f932c583 Merge changes from topic "FixSRGBSetColorMode_VTS_qt-dev" into qt-dev
am: 818fff840a

Change-Id: I9c9495e9b3f0d6dfcd890364ea94092a3c534110
2019-07-19 08:09:16 -07:00
Valerie Hau
c055afc896 DO NOT MERGE: Fixing SRGB for devices that do not support SRGB color mode
am: 2f3553e1ed

Change-Id: Ibd4517cb5e5826a855840ff2259316a5177b779a
2019-07-19 08:09:13 -07:00
jie.yuan
4818d467d7 VTS : fix vts fail [1/1]
am: 70e5b556ef

Change-Id: I2adf8b4ee2afe09e578749c0f772e4a5a1e8ae6c
2019-07-19 08:09:04 -07:00
Valerie Hau
7f42547069 [automerger skipped] Merge changes from topic "FixSRGBSetColorMode_VTS_qt-dev" into qt-dev
am: 818fff840a -s ours
am skip reason: change_id Ie8f53effe3e6e29a4523ebfa450c79fdf96ed585 with SHA1 37d1599e0b is in history

Change-Id: I78053cd905db78c02ea6848a4b0fc9fb3d619b3c
2019-07-19 08:08:48 -07:00
Valerie Hau
818fff840a Merge changes from topic "FixSRGBSetColorMode_VTS_qt-dev" into qt-dev
* changes:
  DO NOT MERGE: Fixing SRGB for devices that do not support SRGB color mode
  VTS : fix vts fail [1/1]
2019-07-19 14:49:44 +00:00
Anil Admal
6abdaac714 VTS 1.1 TestGnssMeasurementCallback test must allow 1.1 or 1.0 versions
Fixes: 137839372
Test: atest VtsHalGnssV1_1Target
Change-Id: Ie3b1fa8b4738c03bff7924396b5eb5c6774841f1
2019-07-18 18:40:53 -07:00
Android Build Merger (Role)
6d3de0896e Merge "Merge "hostapd(vts): Add a property for SAP interface" into qt-dev am: 896c71a7d2 am: 354c2c6c55" into qt-r1-dev-plus-aosp 2019-07-19 01:30:17 +00:00
Roshan Pius
aaaf428e68 Merge "hostapd(vts): Add a property for SAP interface" into qt-dev am: 896c71a7d2
am: 3e01cbd710

Change-Id: If9310911a09d7a46aea6456e334e7c9a9c306581
2019-07-18 18:29:58 -07:00
Roshan Pius
55e2045f6e Merge "hostapd(vts): Add a property for SAP interface" into qt-dev am: 896c71a7d2
am: 354c2c6c55

Change-Id: I748c37355c90682b18369fffaedaff5eeaa0b568
2019-07-18 18:29:58 -07:00
Roshan Pius
3e01cbd710 Merge "hostapd(vts): Add a property for SAP interface" into qt-dev
am: 896c71a7d2

Change-Id: I6b1857fc92a3f42c5e82ed565f4fb38695934556
2019-07-18 18:18:57 -07:00
Roshan Pius
354c2c6c55 Merge "hostapd(vts): Add a property for SAP interface" into qt-dev
am: 896c71a7d2

Change-Id: Ib1c81c3a07e8145edc00e783357079304eff9f75
2019-07-18 18:18:57 -07:00
TreeHugger Robot
896c71a7d2 Merge "hostapd(vts): Add a property for SAP interface" into qt-dev 2019-07-19 00:57:14 +00:00
Roshan Pius
9a8538b4ee hostapd(vts): Add a property for SAP interface
Changes to the VTS test to support OEM's who use a separate
dedicated SAP interface.

Note: This is a VTS test change only. The default implementation does
not still support a dedicated SAP interface (OEM's can obviously
customize the default implementation for their devices).

Bug: 136645414
Test: None (verified by partner OEM)
Change-Id: I42b87bf90cfa90c7c218309164ab2b77f3685f9e
2019-07-18 14:38:41 +00:00
nxp72763
264afa4a2c Merge "Align NFCEE ID range with NCI 1.0 in VtsNfcv1.2 test" into qt-dev am: fc480f5904
am: a17bbf6d31

Change-Id: Icd9d4c1c1c20c8362bc70546ff05d30ebc8edd57
2019-07-18 00:46:54 -07:00
nxp72763
fb5a9774d5 Merge "Align NFCEE ID range with NCI 1.0 in VtsNfcv1.2 test" into qt-dev am: fc480f5904
am: 86ccc5e1d6

Change-Id: I6ae2e2863a726138d4b210bf70b3552de9637edc
2019-07-18 00:38:18 -07:00
nxp72763
86ccc5e1d6 Merge "Align NFCEE ID range with NCI 1.0 in VtsNfcv1.2 test" into qt-dev
am: fc480f5904

Change-Id: Ifddce2d38d1a50eb7b70e675bbba4b75d489c1ef
2019-07-18 00:30:14 -07:00
Android Build Merger (Role)
4d24f4ec38 Merge "Adapt change clearkey to Lazy hal am: 0a50473369 am: 588b4ead25" into qt-r1-dev-plus-aosp 2019-07-18 07:19:25 +00:00
nxp72763
a17bbf6d31 Merge "Align NFCEE ID range with NCI 1.0 in VtsNfcv1.2 test" into qt-dev
am: fc480f5904

Change-Id: Ifc02910c85e47515bc990de4b08a4f4930f6576b
2019-07-18 00:19:17 -07:00
zhangweiwei
6765e3f9d9 Adapt change clearkey to Lazy hal am: 0a50473369
am: 588b4ead25

Change-Id: If3da3dca05ccb1c42a0570e39d2e792a04729a97
2019-07-18 00:19:17 -07:00
zhangweiwei
6817a228a6 Adapt change clearkey to Lazy hal am: 0a50473369
am: 424308c5ad

Change-Id: I7f7c540ec83ed8d76b06d5c7c8d753c856722454
2019-07-18 00:19:16 -07:00
zhangweiwei
424308c5ad Adapt change clearkey to Lazy hal
am: 0a50473369

Change-Id: I78be3e06995b60dbe9cca6fedbc93f4c26d8c770
2019-07-18 00:11:19 -07:00
zhangweiwei
588b4ead25 Adapt change clearkey to Lazy hal
am: 0a50473369

Change-Id: I9710b3b0caeb98853981728c47226bccce2445c6
2019-07-18 00:11:19 -07:00
TreeHugger Robot
fc480f5904 Merge "Align NFCEE ID range with NCI 1.0 in VtsNfcv1.2 test" into qt-dev 2019-07-18 07:06:16 +00:00
zhangweiwei
0a50473369 Adapt change clearkey to Lazy hal
Exempt-From-Owner-Approval

Bug:135896867
Test: vts-tradefed run commandAndExit vts-staging-default -m VtsHalDrmV1_1Target

Change-Id: Iadba7a7afdccfe8a6299e3c0e1e03f63a58c5ca8
2019-07-17 23:24:56 +00:00
Anil Admal
dbef8877c0 Merge "Add GetLocationLowPower VTS 2.0 test" into qt-r1-dev
am: 954f4fef65

Change-Id: Id553c7b77c0b87e29c8055eb9421823b198a3a9d
2019-07-17 14:57:09 -07:00
Anil Admal
954f4fef65 Merge "Add GetLocationLowPower VTS 2.0 test" into qt-r1-dev 2019-07-17 21:38:29 +00:00
Valerie Hau
2e6f7a6fb6 DO NOT MERGE: Fixing SRGB for devices that do not support SRGB color mode
am: 37d1599e0b

Change-Id: I1aebf696b62bf7d6604706e43124bf9f0e0bfe45
2019-07-17 10:41:52 -07:00
jie.yuan
32e81c4337 VTS : fix vts fail [1/1]
am: 0d7f7882e7

Change-Id: If0b9ce516652b416de96c396b15cb326f61ca4e6
2019-07-17 10:41:48 -07:00
Steven Moreland
e1070857c2 Fix cas build. am: b2ee26784b
am: cd4627348b

Change-Id: Ic7ef7875c1fb32bcdd02fa661ab549afb75b24b9
2019-07-16 17:59:34 -07:00
Steven Moreland
cd4627348b Fix cas build.
am: b2ee26784b

Change-Id: Ia6f79c79c3f84824c953df3a6ae9c8da937c10d7
2019-07-16 17:48:48 -07:00
Steven Moreland
b2ee26784b Fix cas build.
Bug/Test: N/A

Change-Id: I37eec1138d9a6eff92c7df30b4c1b7ba7a45e3ae
2019-07-16 14:44:10 -07:00
Valerie Hau
37d1599e0b DO NOT MERGE: Fixing SRGB for devices that do not support SRGB color mode
Bug: 135375302
Test: build, boot, VtsHalGraphicsComposerV2_2TargetTest
Change-Id: Ie8f53effe3e6e29a4523ebfa450c79fdf96ed585
2019-07-16 21:24:57 +00:00
Valerie Hau
2f3553e1ed DO NOT MERGE: Fixing SRGB for devices that do not support SRGB color mode
Bug: 135375302
Test: build, boot, VtsHalGraphicsComposerV2_2TargetTest
Change-Id: Ie8f53effe3e6e29a4523ebfa450c79fdf96ed585
Merged-In: Ie8f53effe3e6e29a4523ebfa450c79fdf96ed585
2019-07-16 14:24:02 -07:00
jie.yuan
70e5b556ef VTS : fix vts fail [1/1]
Problem:
VtsHalGraphicsComposerV2_1Target#GraphicsComposerHidlCommandTest.PRESENT_DISPLAY_NO_LAYER_STATE_CHANGES fail
the testcase setcolormode SRGB without check if current device support SRGB

Solution:
change setColorMode from SRGB to NATIVE

Verify:
verify in on franklin

Bug: 135375302
Test: build, boot, VtsHalGraphicsComposerV2_1TargetTest
Change-Id: I646c263d96b03f9d30e6563a45cff37835001609
Merged-In: I5eebe5f530e3b62037d669992cf2eca0849f10be
2019-07-16 14:19:05 -07:00
jie.yuan
0d7f7882e7 VTS : fix vts fail [1/1]
Problem:
VtsHalGraphicsComposerV2_1Target#GraphicsComposerHidlCommandTest.PRESENT_DISPLAY_NO_LAYER_STATE_CHANGES fail
the testcase setcolormode SRGB without check if current device support SRGB

Solution:
change setColorMode from SRGB to NATIVE

Verify:
verify in on franklin

Bug:135375302
Test: build, boot, VtsHalGraphicsComposerV2_1TargetTest
Change-Id: I5eebe5f530e3b62037d669992cf2eca0849f10be
Merged-In: I5eebe5f530e3b62037d669992cf2eca0849f10be
2019-07-16 13:39:09 -07:00
Anil Admal
03bc98e028 Add GetLocationLowPower VTS 2.0 test
- Run test only if LOW_POWER_MODE capability is supported.
- Modify the corresponding VTS 1.1 test to run only if the GNSS
  HAL version is 1.1.

Fixes: 127434062
Test: atest VtsHalGnssV2_0Target
Change-Id: Icbd18d80468e9e5a542f2eace5bfbe45af08ca47
2019-07-15 18:56:37 -07:00
Anthony Stange
59e30a81eb Verify mPollThread is joinable before detaching am: 65945cfb15
am: b008fb2c25

Change-Id: I5d28e3895a3d5825ad3c71119cc7e17bedbbc493
2019-07-15 18:13:56 -07:00
Anthony Stange
ce98cb7938 Verify mPollThread is joinable before detaching am: 65945cfb15
am: f75cf1cf4d

Change-Id: I8282d67898fffa2efff979250b10dde842511daa
2019-07-15 18:12:24 -07:00
Anthony Stange
f75cf1cf4d Verify mPollThread is joinable before detaching
am: 65945cfb15

Change-Id: Iee183865223aa993241c19924245177b3462d4da
2019-07-15 17:50:18 -07:00
Anthony Stange
b008fb2c25 Verify mPollThread is joinable before detaching
am: 65945cfb15

Change-Id: Ia4c4ef1d4e30d8854ee95c9b0cdfb44ad2bb630a
2019-07-15 17:50:17 -07:00
Anthony Stange
65945cfb15 Verify mPollThread is joinable before detaching
If HidlSetUp() bails before startPollingThread() is called (which can
happen if the HAL isn't implemented on the given device), mPollThread
will initialize with the default constructor resulting in joinable()
returning false which means calling detach() throws an exception.

Checking joinable() before detaching allows the test suite to be skipped
successfully.

Fixes: 136736906
Test: Run vts-tradefed on VtsHalSensorsV1_0Target and verify that it is
    skipped successfully on a device that doesn't support HAL 1.0

Change-Id: Ie685ae2dc314edb8df2f3cc7112141a2f5e46008
2019-07-15 19:17:25 +00:00
Youming Ye
b518294134 Add REQUEST_NOT_SUPPORTED to startNetworkScan
am: f829d25956

Change-Id: Ibef9e528aa7dea66aec0955f7feec81635c3eeab
2019-07-12 18:30:05 -07:00
Youming Ye
f829d25956 Add REQUEST_NOT_SUPPORTED to startNetworkScan
Test: VTS
Bug: 137298570
Change-Id: I99df8495c5f654cb1420b7da36d7f5128ce14dbc
2019-07-12 15:15:58 -07:00