Commit Graph

17471 Commits

Author SHA1 Message Date
Haibo Huang
2d2ca3ca41 Add definitions of GMOCK_RESULT_ and GMOCK_ARG_
These two definitions are removed in new googletest. Copy them here.

(Ideally we should not depend on googletest internal.

Change-Id: I399549dc33dce7a464e81978e0697fc649ff01b0
2020-02-10 22:09:18 +00:00
Treehugger Robot
5adcaebd8c Merge "Fix health.storage test" 2020-02-09 03:47:37 +00:00
Treehugger Robot
69459316b8 Merge "Add a few type for Analog frontend" 2020-02-08 02:10:24 +00:00
Amy Zhang
76c90b21cc Merge "Add @export to frontend scan enums" 2020-02-08 01:47:40 +00:00
Amy Zhang
4556d59c3a Merge "Export FrontendDvbtPlpMode" 2020-02-08 01:47:21 +00:00
Amy Zhang
c670dca9c6 Merge "Add DataId for Audio Handle in Audio Track" 2020-02-08 01:47:09 +00:00
Michael Butler
ea14e3445e Merge "NNAPI HAL: Remove priority from prepareModelFromCache_1_3" 2020-02-08 00:39:37 +00:00
Yifan Hong
c6e3fd118a Fix health.storage test
- fix root
- fix test timeout

Test: adb unroot and atest

Fixes: 149044321

Change-Id: Icc34af149641f7fe5035cee1fe9685b395adc22f
2020-02-07 22:49:07 +00:00
Treehugger Robot
e961dddd15 Merge "Add AIDL Lights HAL to support multiple lights per type" 2020-02-07 20:22:52 +00:00
Treehugger Robot
6918c455e1 Merge "audio: Fix audio effects schema for V6" 2020-02-07 18:26:07 +00:00
Treehugger Robot
195682b2cf Merge "[vts-core] add VtsHalBluetoothV1_0TargetTest to vts-core" 2020-02-07 09:49:42 +00:00
shubang
e3b37d3789 Add @export to frontend scan enums
Test: make;
Change-Id: I9489ae28722e73de0aba7e83b115935546e8e357
Merged-In: I9489ae28722e73de0aba7e83b115935546e8e357
(cherry picked from commit efb7ffa6ca)
2020-02-07 02:49:07 +00:00
Henry Fang
8c7b8b7e18 Add a few type for Analog frontend
Test: Manual
bug: 135708935
Change-Id: Ib0dbd610620682854f8c2b421285da39233cec01
Merged-In: Ib0dbd610620682854f8c2b421285da39233cec01
(cherry picked from commit d13c298ff5)
2020-02-06 18:48:40 -08:00
Henry Fang
92f17c7dcb Add DataId for Audio Handle in Audio Track
Test: Manual
bug: 135708935
Change-Id: I639d65999dbf1bf727837298804c350698a9f08a
Merged-In: I639d65999dbf1bf727837298804c350698a9f08a
(cherry picked from commit fe019ac3f7)
2020-02-06 18:47:55 -08:00
shubang
785589353f Export FrontendDvbtPlpMode
Test: make;
Change-Id: I3d4c0667ba1251b3038681759c50b453cd40a8ca
Merged-in: I3d4c0667ba1251b3038681759c50b453cd40a8ca
(cherry picked from commit e266073ed6)
2020-02-06 18:45:19 -08:00
Steven Moreland
84dd3b7496 Add AIDL Lights HAL to support multiple lights per type
This is a revision of the previous 2.0 HIDL-based light HAL.
It accomplishes 2 goals:
 1) Support more than 1 light for a given type. This allows Assistant to
    use the HAL on TV platforms that have usually 4 indicator lights.
 2) Use AIDL, which is the more modern way of writing HALs.
The previous HAL is in hardware/interfaces/light/2.0 and the new one is
in versioned as aidl, as that supports forward compatibility.

Test: atest VtsHalLightTargetTest
Bug: 142715294, 142230898
Change-Id: I6d8c12b3df88e02f2a0fff8b6aa8543372b510c8
Merged-In: I08d831ca0380d8bb187e43f6d5c214810ff72f50
2020-02-07 01:50:36 +01:00
Treehugger Robot
456d54c936 Merge "NNAPI: Add OptionalTimeoutDuration to 1.3/types.t" 2020-02-07 00:50:17 +00:00
Mikhail Naganov
9f83bb9fb7 audio: Fix audio effects schema for V6
There was a mistake in the XSD file introduced in aosp/1201850.

Bug: 148979886
Test: atest VtsHalAudioEffectV6_0TargetTest
Change-Id: I02f869031e0d4687d6e099fa5d4593d4b5cc8243
2020-02-06 10:33:25 -08:00
Michael Butler
68a868b2ac NNAPI HAL: Remove priority from prepareModelFromCache_1_3
prepareModelFromCache_1_3 uses model cache and data cache that
represent a prepared model. Any argument that contributes in a
meaningful way to the prepared model is implicitly included in
this model cache and data cache. For example, "model" and
"executionPreference" appear in prepareModel_1_3 but not in
prepareModelFromCache_1_3 because they are implicitly included
in the model cache and data cache. In a similar way, because
it could affect the resulting model, "priority" should be
removed from prepareModelFromCache_1_3.

Fixes: 148802784
Test: mma
Test: VtsHalNeuralnetworksV1_3TargetTest
Change-Id: I518e493ead8aa97220b16370cce8523b425c378c
Merged-In: I518e493ead8aa97220b16370cce8523b425c378c
(cherry picked from commit c90250ff57)
2020-02-06 11:38:08 +00:00
Lev Proleev
124659e450 NNAPI: Add OptionalTimeoutDuration to 1.3/types.t
To sync 1.3/types.t with 1.3/types.hal

Test: generate_api.sh
Change-Id: I6a6e46ec82b4f25d77f7e1af18cc9d6f9478e5b7
Merged-In: I6a6e46ec82b4f25d77f7e1af18cc9d6f9478e5b7
(cherry picked from commit a9c097abec)
2020-02-06 11:38:06 +00:00
Dongwon Kang
b0607b90b9 Remove unnecessary include in service.cpp
Test: build.
Bug: 139201422

Exempt-From-Owner-Approval: cherry-pick from internal

Merged-In: I13fcd1223eacc999c66c514b549c51a96e4efda6
(cherry picked from commit d6887ca8cc)
Change-Id: I13fcd1223eacc999c66c514b549c51a96e4efda6
2020-02-06 18:47:39 +09:00
nelsonli
036685442b [vts-core] add VtsHalBluetoothV1_0TargetTest to vts-core
Bug: 142397658
Test: $atest VtsHalBluetoothV1_0TargetTest
Change-Id: Ic9efda5d766e35f58f9067d489ca91b1c3c3634e
2020-02-06 16:21:08 +08:00
David Gross
0db1b54e9a redefine _Float16 as __fp16 for x86[_64] to allow removing workaround from inhouse clang
At present, the tests might not actually use _Float16 (the generated
tests that are incorporated into the functional tests are built in
frameworks/ml rather than in hardware/interfaces); but the makefiles
are changed anyway, in case _Float16 is added in the future.

Bug: 138709788

Test: for (walleye, aosp_x86 [on emulator], aosp_x86_64 [on emulator])
        Use clang where _Float16 is disabled for x86[_64]
        $ cd $ANDROID_BUILD_TOP/neuralnetworks/1.0/vts/functional
        inspect build commands for tests as to whether or not
          expected options related to redefinition are present
        $ cd $ANDROID_BUILD_TOP/neuralnetworks/1.1/vts/functional
        inspect build commands for tests as to whether or not
          expected options related to redefinition are present

Change-Id: I9225b228947696d249771b3a35b1f82de9c26b6e
(cherry picked from commit 2452ee5a80)
2020-02-05 11:09:22 -08:00
Steven Moreland
d1fa583382 Merge "s/hidl_/hal_/ for hidl_implementation_test" 2020-02-05 17:05:30 +00:00
Treehugger Robot
30fc7d4ba3 Merge "Fix formatting errors in sensors MH2 bp files" 2020-02-05 00:23:26 +00:00
Stan Rokita
4820138e21 Fix formatting errors in sensors MH2 bp files
Test: build

Change-Id: Idb00ed68c9805a055bf87560f02605920c4149e5
2020-02-04 16:01:44 -08:00
Dan Shi
badb75e309 Merge "Remove reference of VtsHalHidlTargetTestBase" 2020-02-04 23:44:04 +00:00
Steven Moreland
0163c229d2 s/hidl_/hal_/ for hidl_implementation_test
In preparation for it including AIDL things.

Bug: 145920591
Test: TH
Change-Id: Ibb5022f049d3c71668e8bde5ff5910ff1d466a95
2020-02-04 13:36:22 -08:00
Treehugger Robot
7175150e3f Merge "Identity Credential: Require passing applicationId when generating attestation." 2020-02-04 21:31:31 +00:00
Treehugger Robot
f107b4231e Merge "Cleanup IRadio/IRadioConfig HAL" 2020-02-04 17:42:39 +00:00
Dan Shi
9910d38aa7 Remove reference of VtsHalHidlTargetTestBase
Bug: 147894326
Test: m -j VtsHalWifiHostapdV1_0TargetTestUtil \
  VtsHalSensorsTargetTestUtils
Change-Id: If11f23db93333ddd702ce5ebf7c5c0b9583c57fa
2020-02-04 03:29:50 +00:00
Xusong Wang
1eb640d440 Merge "Update sync fence related API for NNAPI" 2020-02-04 00:19:25 +00:00
Treehugger Robot
b2e4c01a76 Merge "[Sensors MH2] Keep track of most events seen on pending queue" 2020-02-03 23:23:39 +00:00
Stan Rokita
e7f293621e [Sensors MH2] Keep track of most events seen on pending queue
Bug: 148243746
Test: Load onto device and run
'adb shell lshal debug android.hardware.sensors@2.0::ISensors/default'
to observe correct output

Change-Id: I8f7d87e86860bbca229051fec35b7048c4b3268b
2020-02-03 13:41:56 -08:00
Sarah Chin
f90eddff52 Cleanup IRadio/IRadioConfig HAL
Removed unused import statements.
Consistent between internal and AOSP.
More accurate names for ModemFeatures.

Test: make
Change-Id: Icbfe35d472ab3f7fd6cd50b4888e3c478dd29fd2
Merged-In: Icbfe35d472ab3f7fd6cd50b4888e3c478dd29fd2
2020-02-03 20:33:33 +00:00
Treehugger Robot
98a05a0bbb Merge "Revert "Update health 2.1 readme for file_contexts"" 2020-02-03 19:18:25 +00:00
Treehugger Robot
138c2bba56 Merge "audio: Remove dynamic dependency on HIDL interface libs from service" 2020-02-03 18:26:22 +00:00
Yifan Hong
056ffd93ed Merge changes from topic "health_charger"
* changes:
  Update health 2.1 README for non A/B devices.
  Add default health 2.1 service to class charger
2020-02-03 18:12:23 +00:00
Yifan Hong
aafba97a5a Revert "Update health 2.1 readme for file_contexts"
This reverts commit ca44707aea.

Reason for revert: charger uses hwbinder health HAL now

Bug: 142674987
Test: none

Change-Id: I2be2d393331ad3c377e0b144cfe0c92d3ab59689
2020-02-01 01:33:27 +00:00
Yifan Hong
b9c4082061 Update health 2.1 README for non A/B devices.
Non A/B devices should install the passthrough health impl
to recovery for IsBatteryOk() check during OTA updates.

Test: pass
Change-Id: Ib83518fd5f8f55f693be88a55fa708459a22417f
2020-01-31 17:20:08 -08:00
Mikhail Naganov
e74b571711 audio: Remove dynamic dependency on HIDL interface libs from service
This is intended to reduce memory footprint of the default HAL
service. The inteface libraries were only used to retrieve
interface descriptors and use generated code to register as
service. This code was replaced with static code from
HIDL transport library.

Bug: 148115870
Test: check audio on devices
Change-Id: Ie8713d513cfbde64120546ba0db1cf80fd366138
Merged-In: Ie8713d513cfbde64120546ba0db1cf80fd366138
2020-01-31 14:57:07 -08:00
David Zeuthen
87cb07bd08 Identity Credential: Require passing applicationId when generating attestation.
Since the attestation format includes the applicationId, we need this
to be passed from credstore. Also clarify other requirements about
what needs to be in the attestation data.

Bug: 111446262
Test: atest android.security.identity.cts
Test: VtsHalIdentityCredentialTargetTest
Test: android.hardware.identity-support-lib-test
Change-Id: I623849bd61e55752a573002dc7a97c6658d94c91
2020-01-31 17:42:07 -05:00
Yifan Hong
b6f7e58a64 Add default health 2.1 service to class charger
... so that it starts up in charger mode.

Test: boot charger and look at serial log
Bug: 142674987
Change-Id: Ic535b86840df1408b76e556f942aebdd9aaba111
2020-01-31 13:26:55 -08:00
Treehugger Robot
60cbc45573 Merge "Minor style fixes for IDumpstateDevice@1.1 VTS test" 2020-01-31 01:55:16 +00:00
Treehugger Robot
99ad09b7e7 Merge "Make IDumpstateDevice 1.1" 2020-01-31 01:06:20 +00:00
Miao Wang
99753d9e90 Update sync fence related API for NNAPI
- Allow IPreparedModel::executeFenced to measure gated durations.
 - Allow IPreparedModel::executeFenced to specify an optional deadline
 and aa optional post-gate-release maximum duration.

Bug: 142778241
Bug: 141363565
Test: mm
Change-Id: I1687ec5543f93ed9bb5d7fcf14dbe15ed5b5cd0d
Merged-In: I1687ec5543f93ed9bb5d7fcf14dbe15ed5b5cd0d
(cherry picked from commit 3fd70b020e)
2020-01-30 15:23:23 -08:00
Xusong Wang
1b4b30d064 Merge changes from topics "aosp-nnapi-1.3-operations", "aosp-nnapi-async-cmdqueue"
* changes:
  Fix the NNAPI vts tests about validateExecuteFenced
  Add VTS tests for NNAPI IPreparedModel::executeFenced
  Support sync fence in NNAPI
  Add FILL and RANK ops
  Add ELU and HARD_SWISH
  NNAPI: Regenerate types.hal to sync with types.spec
2020-01-30 23:18:32 +00:00
Robert Shih
568b391009 Merge "drm vts 1.2 refactor" 2020-01-30 03:55:29 +00:00
Treehugger Robot
a399d331fb Merge "vibrator: Deduplicate Supported Primitives Check" 2020-01-29 23:54:06 +00:00
Jordan Liu
66d9a93a71 Merge "Fix issues for Japan model." 2020-01-29 22:28:15 +00:00