Commit graph

17004 commits

Author SHA1 Message Date
TreeHugger Robot
9f668424f2 Merge "Add an OWNER file to the Tuner HAL 1.0 VTS" 2019-09-05 17:39:04 +00:00
Steven Moreland
72826db6c8 Merge "Rename a2dp impl as mock." am: 0504b501ff am: 526dbf24b9 am: 072c31c94d am: 978e16f08a
am: 3abd078b19

Change-Id: I5f634aa7b1eae83095f704d14a286e69d5a05214
2019-09-05 04:43:09 -07:00
Steven Moreland
3abd078b19 Merge "Rename a2dp impl as mock." am: 0504b501ff am: 526dbf24b9 am: 072c31c94d
am: 978e16f08a

Change-Id: I98726480ff094628fb8c5bd749d4bacae17d4685
2019-09-05 04:36:35 -07:00
Steven Moreland
978e16f08a Merge "Rename a2dp impl as mock." am: 0504b501ff am: 526dbf24b9
am: 072c31c94d

Change-Id: I98826747bdfdb2089c00a2019bab4a925bf243b7
2019-09-05 04:27:06 -07:00
Steven Moreland
072c31c94d Merge "Rename a2dp impl as mock." am: 0504b501ff
am: 526dbf24b9

Change-Id: I5bab1d4222e9e906488db2d903a1e5b6fe7eafa5
2019-09-05 04:20:33 -07:00
Steven Moreland
526dbf24b9 Merge "Rename a2dp impl as mock."
am: 0504b501ff

Change-Id: I366a4f69d0af1adecd2190d47136dd295423a056
2019-09-05 04:14:03 -07:00
Treehugger Robot
0504b501ff Merge "Rename a2dp impl as mock." 2019-09-05 10:53:27 +00:00
Amy Zhang
983289314d Merge changes from topic "tuner_filter"
* changes:
  Tuner HAL Demux Filter VTS
  Tuner HAL Filter APIs default implementation
  Add filter function to Demux interface and Add program info to Descrambler
2019-09-05 03:16:23 +00:00
Amy
2814d04173 Add an OWNER file to the Tuner HAL 1.0 VTS
Test: manual
Change-Id: I2e5992a827dc430118cfbd68982c4ef08aa9b0e1
2019-09-04 19:20:29 -07:00
Amy
052275a924 Tuner HAL Demux Filter VTS
Test: atest VtsHalTvTunerV1_0TargetTest
Bug: 135708935
Change-Id: I2b6b7e904cb274e7ccd10e481b04dfd9394afe3e
2019-09-04 18:31:27 -07:00
Amy
a609d5a0e2 Tuner HAL Filter APIs default implementation
Bug: 135709325
Test: manual
Change-Id: If10acac560d3130105079121602be576eb0b225a
2019-09-04 18:31:09 -07:00
Henry Fang
2dfa337903 Add filter function to Demux interface and Add program info to Descrambler
bug: 135708935
Test: Manual
Change-Id: Iacaebdac6a8ce08ca47ae272be13d51fbd502959
2019-09-04 18:30:46 -07:00
Mike Ma
6b62bfb873 Merge "Rev up vr_hwc to composer@2.3" 2019-09-04 14:47:11 +00:00
TreeHugger Robot
b1b80dc923 Merge "Set up shell to use for unit tests" 2019-09-03 18:29:27 +00:00
Anthony Stange
aacbf94854 Set up shell to use for unit tests
Sets up a unit test file that can be used to unit test the HalProxy. The
unit tests will eventually end up containing code that injects the fake
SensorsSubHal implementation into the HalProxy and verifies various
parts of the implementation. This will likely require some modifications
to the SensorsSubHal class to modify it during test execution, but it's
better that the same implementation is shared between unit / manual
integration testing.

Test: Run atest android.hardware.sensors@2.0-halproxy-unit-tests
Bug: 136511617
Change-Id: I7b6865564ea41ab3c58f77d3168366c95e3289e5
2019-09-03 11:22:38 -04:00
Michael Butler
6addeddb9c Merge "Consolidate NNAPI VTS utility code" 2019-08-30 23:43:56 +00:00
Michael Butler
e16af0a44b Consolidate NNAPI VTS utility code
This CL does additional NNAPI VTS test cleanup, including consolidating
duplicate functionality. Specifically, this CL:
* consolidates the createPreparedModel function, removing the duplicate
* consolidates the std::out ErrorStatus and DeviceStatus code into Utils
* changes non-null constant pointers to constant references
* removes redudant leading namespace specifiers (V1_0::, ::testing, etc.)
* makes the Valdiation tests free functions
* renames device to kDevice and mTestModel to kTestModel

Bug: N/A
Test: mma
Test: VtsHalNeuralnetworksV1_*TargetTest (with sample-all)
Change-Id: Ic401bb1f1760cc10384ac0d30c0c93409b63a9c7
2019-08-30 14:01:38 -07:00
Michael Butler
990024bb93 [automerger skipped] Cleanup NNAPI VTS tests am: 62749b917e am: f952adda07 am: fb3b426d6e am: d42bc350b2
am: 9b79387e48 -s ours
am skip reason: change_id I023997d8686ca65223858eed3a0881f5444ed2d6 with SHA1 bbe5dad266 is in history

Change-Id: Ife8c7925b30d3b05ecbee5899231bf710ee8440f
2019-08-30 12:28:40 -07:00
Michael Butler
9b79387e48 Cleanup NNAPI VTS tests am: 62749b917e am: f952adda07 am: fb3b426d6e
am: d42bc350b2

Change-Id: I3acfd9cf6a999993cd7ea035110d490f01329fd6
2019-08-30 12:09:04 -07:00
Steven Moreland
59d39ab02c Rename a2dp impl as mock.
So that it isn't accidentally used.

Bug: 140115084
Test: codesearching for usages
Change-Id: I2736a875d8a3021ce496847c45259f10aa148bc0
2019-08-30 11:53:44 -07:00
Michael Butler
d42bc350b2 Cleanup NNAPI VTS tests am: 62749b917e am: f952adda07
am: fb3b426d6e

Change-Id: I5460bc9f1bd2ea62119e44a8848f0aa1b7d4f4c3
2019-08-30 11:47:39 -07:00
Michael Butler
fb3b426d6e Cleanup NNAPI VTS tests am: 62749b917e
am: f952adda07

Change-Id: I6337d46d526ec81dbfc57ca7f94f08dc95830fc7
2019-08-30 11:29:33 -07:00
Michael Butler
f952adda07 Cleanup NNAPI VTS tests
am: 62749b917e

Change-Id: Ia71e9765a810b2f07c4dbec5e101e357c64ba91d
2019-08-30 11:17:32 -07:00
Michael Butler
62749b917e Cleanup NNAPI VTS tests
This CL includes the following cleanups:
* namespace compression
* remove "using" from header files
* remove no-op code, default no-op constructors
* clang-formats the code

Bug: N/A
Test: mma
Test: VtsHalNeuralnetworksV1_*TargetTest
Change-Id: I023997d8686ca65223858eed3a0881f5444ed2d6
Merged-In: I023997d8686ca65223858eed3a0881f5444ed2d6
(cherry picked from commit bbe5dad266)
2019-08-29 12:55:56 -07:00
David Gross
148fa123e6 [automerger skipped] Merge "Fix V1_2::IDevice::getType documentation: was @param instead of @return" am: 15b826ad6a am: c9981f9592 am: 1da8ae3753 am: 39a515e2bc
am: f35dc87458 -s ours
am skip reason: change_id I45d1320a9edae73cde7d9ccaca57b5b9519b0210 with SHA1 c7cdd550a0 is in history

Change-Id: I83d38dbb9ea0fe4a9e7245b6e83b53353757f2a2
2019-08-29 11:44:55 -07:00
David Gross
f35dc87458 Merge "Fix V1_2::IDevice::getType documentation: was @param instead of @return" am: 15b826ad6a am: c9981f9592 am: 1da8ae3753
am: 39a515e2bc

Change-Id: Ie0a4a75684294a723b1974c6daef9b85b2dd86eb
2019-08-29 11:39:28 -07:00
David Gross
39a515e2bc Merge "Fix V1_2::IDevice::getType documentation: was @param instead of @return" am: 15b826ad6a am: c9981f9592
am: 1da8ae3753

Change-Id: Ic63a78df2e27557e9ca6dad898c1721e74f7f651
2019-08-29 11:32:05 -07:00
David Gross
1da8ae3753 Merge "Fix V1_2::IDevice::getType documentation: was @param instead of @return" am: 15b826ad6a
am: c9981f9592

Change-Id: I0d3e630b71db47626f655de12a9e685fb385858e
2019-08-29 11:22:46 -07:00
David Gross
c9981f9592 Merge "Fix V1_2::IDevice::getType documentation: was @param instead of @return"
am: 15b826ad6a

Change-Id: I81b920f6c0edb6f1709af8d8b609e21d64e5755e
2019-08-29 11:14:21 -07:00
Michael Butler
8bc15b59ae Merge "Cleanup NNAPI VTS tests" 2019-08-29 18:04:01 +00:00
Anthony Stange
c6d8738b30 Merge "[automerger skipped] Fix wait_for timestamps in Sensors VTS am: eac8d9acc9 -s ours am: 32ecb053a9 -s ours am: 004027ac60 -s ours
am: 3d3e6be52c -s ours
am skip reason: change_id Ibba59dbf9312f97d7275e5aa8cd36547ab09e328 with SHA1 4a80e231ed is in history

Change-Id: I7cbefdd87f5a5ad71c06e97bef73095cad983a02
2019-08-29 10:59:07 -07:00
Anthony Stange
fd0a1466a8 Merge "[automerger skipped] Fix wait_for timestamps in Sensors VTS am: eac8d9acc9 -s ours am: 32ecb053a9 -s ours am: 6c232ced93 -s ours
am: 4149337a7a -s ours
am skip reason: change_id Ibba59dbf9312f97d7275e5aa8cd36547ab09e328 with SHA1 4a80e231ed is in history

Change-Id: If63db4e9d0435c13592835f424dcda31810e48e8
2019-08-29 10:58:37 -07:00
Anthony Stange
51b7382252 [automerger skipped] Fix wait_for timestamps in Sensors VTS am: eac8d9acc9 am: c19af4a907 -s ours am: 1da618f210 -s ours
am: ddc9e74a77 -s ours
am skip reason: change_id Ibba59dbf9312f97d7275e5aa8cd36547ab09e328 with SHA1 4a80e231ed is in history

Change-Id: I8bc4d659190a7f1e785c89131bf5dd741a72d5be
2019-08-29 10:57:49 -07:00
Anthony Stange
3d3e6be52c Merge "[automerger skipped] Fix wait_for timestamps in Sensors VTS am: eac8d9acc9 -s ours am: 32ecb053a9 -s ours
am: 004027ac60 -s ours
am skip reason: change_id Ibba59dbf9312f97d7275e5aa8cd36547ab09e328 with SHA1 4a80e231ed is in history

Change-Id: I2533c5194469667aeaeb9829dc063a366aa91f98
2019-08-29 10:50:24 -07:00
Android Build Merger (Role)
4149337a7a Merge "[automerger skipped] Fix wait_for timestamps in Sensors VTS am: eac8d9acc9 -s ours am: 32ecb053a9 -s ours am: 6c232ced93 -s ours am skip reason: change_id Ibba59dbf9312f97d7275e5aa8cd36547ab09e328 with SHA1 4a80e231ed is in history" into qt-qpr1-dev-plus-aosp 2019-08-29 17:50:05 +00:00
Anthony Stange
ddc9e74a77 [automerger skipped] Fix wait_for timestamps in Sensors VTS am: eac8d9acc9 am: c19af4a907 -s ours
am: 1da618f210 -s ours
am skip reason: change_id Ibba59dbf9312f97d7275e5aa8cd36547ab09e328 with SHA1 4a80e231ed is in history

Change-Id: I9bf9b0fa11de35ccb0d5db2865421d03b5c1d3db
2019-08-29 10:49:54 -07:00
Anthony Stange
0d32239bd6 [automerger skipped] Fix wait_for timestamps in Sensors VTS am: eac8d9acc9 -s ours am: 32ecb053a9 -s ours
am: 6c232ced93 -s ours
am skip reason: change_id Ibba59dbf9312f97d7275e5aa8cd36547ab09e328 with SHA1 4a80e231ed is in history

Change-Id: I6a827e23694912b0698a0c2fc800e7a83bd8aeff
2019-08-29 10:49:54 -07:00
David Gross
15b826ad6a Merge "Fix V1_2::IDevice::getType documentation: was @param instead of @return" 2019-08-29 17:44:04 +00:00
Android Build Merger (Role)
004027ac60 Merge "[automerger skipped] Fix wait_for timestamps in Sensors VTS am: eac8d9acc9 -s ours am: 32ecb053a9 -s ours am skip reason: change_id Ibba59dbf9312f97d7275e5aa8cd36547ab09e328 with SHA1 4a80e231ed is in history" into qt-r1-dev-plus-aosp 2019-08-29 17:44:01 +00:00
Anthony Stange
6c232ced93 [automerger skipped] Fix wait_for timestamps in Sensors VTS am: eac8d9acc9 -s ours
am: 32ecb053a9 -s ours
am skip reason: change_id Ibba59dbf9312f97d7275e5aa8cd36547ab09e328 with SHA1 4a80e231ed is in history

Change-Id: Ia39e231f93e97229a3ab9241e8b2bb9eb1c7205a
2019-08-29 10:43:52 -07:00
Anthony Stange
1da618f210 [automerger skipped] Fix wait_for timestamps in Sensors VTS am: eac8d9acc9
am: c19af4a907 -s ours
am skip reason: change_id Ibba59dbf9312f97d7275e5aa8cd36547ab09e328 with SHA1 4a80e231ed is in history

Change-Id: I14a37d75839322e6e99833886f86ecb1fc4d98e1
2019-08-29 10:43:51 -07:00
Anthony Stange
843df4415f [automerger skipped] Fix wait_for timestamps in Sensors VTS am: eac8d9acc9 -s ours
am: 32ecb053a9 -s ours
am skip reason: change_id Ibba59dbf9312f97d7275e5aa8cd36547ab09e328 with SHA1 4a80e231ed is in history

Change-Id: I6e5518a3f1a0f383dbc28dcfb8138966b3e8d7c6
2019-08-29 10:43:51 -07:00
Anthony Stange
c19af4a907 Fix wait_for timestamps in Sensors VTS
am: eac8d9acc9

Change-Id: I21c8577ecc56e2d2334352e2f3e9c386cc6aead6
2019-08-29 10:34:49 -07:00
Anthony Stange
32ecb053a9 [automerger skipped] Fix wait_for timestamps in Sensors VTS
am: eac8d9acc9 -s ours
am skip reason: change_id Ibba59dbf9312f97d7275e5aa8cd36547ab09e328 with SHA1 4a80e231ed is in history

Change-Id: I02fe7d1fe9f6068432723a3812a7b7a5a6f6bcbd
2019-08-29 10:34:49 -07:00
Anthony Stange
eac8d9acc9 Fix wait_for timestamps in Sensors VTS
Previously, NoStaleEvents was treating any timestamps it dealt with as
if they were in microseconds, but sensors.minDelay is in microseconds
and Event timestamps are in nanoseconds. This uses std::chrono helpers
to ensure the correct time is used when deciding how long to sleep
during the test so that if waitForEvents never passes, the test doesn't
time out.

Bug: 136736906
Test: Run VTS and verify VtsHalSensorsV2_0Target doesn't finish as an
    incomplete module.

Change-Id: Ibba59dbf9312f97d7275e5aa8cd36547ab09e328
Merged-In: Ibba59dbf9312f97d7275e5aa8cd36547ab09e328
2019-08-29 10:04:52 -04:00
Michael Butler
7e276611f1 [automerger skipped] NNAPI Combine Compatability test with VTS test am: 3247f76e35 am: 52da1b820c am: 3967ccfffa am: 17d8081fbc
am: d2a6e568f1 -s ours
am skip reason: change_id Ib93d159dc657eaf292d16140ebdd9de3b0f5f1d3 with SHA1 72227f3ef8 is in history

Change-Id: Ifeafb87512fb207438f48dab97c53c352c7addf3
2019-08-28 18:40:05 -07:00
Michael Butler
feda2912a3 [automerger skipped] Change NNAPI VTS to use static library am: 01ba094edb am: ba2da6c2d3 am: 41b38ee6d0 am: b6a206b411
am: 9f15880696 -s ours
am skip reason: change_id I65274b5f72def815ff238a8d8df10c9d014afc44 with SHA1 f7a8f03e3d is in history

Change-Id: I40c750649bfc76b97a67b804675c3d0a7a1bb508
2019-08-28 18:39:51 -07:00
Xusong Wang
4a45d02101 [automerger skipped] Merge changes from topic "nnapi_test_dynamic_reg" am: 6568622209 am: 0ac1896ef5 am: 2bfcfe37a9 am: 0e8c242bf0
am: e6aabcd0e0 -s ours
am skip reason: change_id I0129378c87637b33bb145ec93307634273a9d2fd with SHA1 cbfa6b998e is in history

Change-Id: Ifbf6d666ec7b918f7dd4bb8540809e9a5d80d154
2019-08-28 18:26:50 -07:00
Xusong Wang
b3a7a7a110 [automerger skipped] Update VTS tests with the new test harness. am: bcaa78293a am: 5fb57da9a2 am: c0ab90d98a am: eacac2df48
am: 5db066d298 -s ours
am skip reason: change_id I539e75585b2cc01d153565814491361adfa048be with SHA1 9e2b97b83c is in history

Change-Id: I49518e0f5e302d13f186ccb0fd400c48980caa3c
2019-08-28 18:26:38 -07:00
Michael Butler
d2a6e568f1 NNAPI Combine Compatability test with VTS test am: 3247f76e35 am: 52da1b820c am: 3967ccfffa
am: 17d8081fbc

Change-Id: Idf34533294f2492aee6e9254e98a45909f33e0f1
2019-08-28 17:56:15 -07:00