Commit Graph

10160 Commits

Author SHA1 Message Date
Yifan Hong
efbb22fec4 matrix: copy kernel configs to subdirectory.
Bug: 78576469
Test: make vintf metadata and manual inspect
Test: vts_treble_vintf_test
Change-Id: Ie3c299e74c9479cbf9a868aeef96f5850feb8cfe
2018-04-30 15:41:41 -07:00
Michael Butler
89802f7423 Merge "NNAPI: sync NDK and HAL documentation" into pi-dev 2018-04-27 23:13:41 +00:00
Yifan Hong
8be536f364 Merge "Restore kernel requirements for frozen matrices." into pi-dev 2018-04-27 22:38:55 +00:00
Michael Butler
e98352806b NNAPI: sync NDK and HAL documentation
Bug: 72650109
Test: mma
Change-Id: I3e0a3680b89d80be500d8975f587f2d7c33fea10
2018-04-27 14:45:32 -07:00
android-build-team Robot
6efdef720f Merge "Camera: check return value of callback" into pi-dev 2018-04-27 20:57:56 +00:00
Yin-Chia Yeh
b0140796a3 Camera: check return value of callback
Test: no crash
Bug: 78181355
Change-Id: Iaf953045b64dd7b258cf49919ccb8aa5a8a0c7d1
2018-04-27 09:32:39 -07:00
Jiabin Huang
418b539737 Merge "Add vts for microphone enumeration APIs." into pi-dev 2018-04-27 15:25:54 +00:00
Yifan Hong
366101caf4 Restore kernel requirements for frozen matrices.
Requirements for legacy/1/2.xml has changed because
android-base.cfg files are changed. These files should
build from an older snapshot of the requirements.

Fixes: 78576469
Test: builds
Test: vts_treble_vintf_test

Change-Id: I908ebbe495ae06f983ef983a1be7937cf6be1c12
2018-04-26 18:40:37 -07:00
Janis Danisevskis
0051181ac7 Fix for bug in Fix for wrongly initialized test key
With the last patch I exposed the auth token key to users of the
GenericOperation. But because the auth token key is never used in the
default implementation it did not show that the setHmacKey method did
not actually work. This patch fixes it.

Bug: 78456249
Test: Compile trusted app based on the GenericOperation
Change-Id: I25a80f985ce500e3658421cac62421133cc5b788
2018-04-26 16:27:12 -07:00
TreeHugger Robot
ba2fa43da6 Merge "Fix wrongly initialized test key." into pi-dev 2018-04-26 20:50:47 +00:00
Janis Danisevskis
fe584fb317 Fix wrongly initialized test key.
According to spec the test key has 32 bytes set to TextKeyBits::BYTE.
The VTS test and default implmementation only set the first 16 bytes and
left the remaining 16 bytes zero.

This bug fixes both, the VTS test and the default implementation.

Also some long overdue changes to how the auth token key is handled
by the generic operation.

Bug: 78456249
Test: VtsHalConfirmationUIV1_0TargetTest
Change-Id: I509f2c2a99704ee00625e6f6169479771a3bc17a
2018-04-26 10:35:57 -07:00
Mika Raento
95eef46fa2 Merge "Update namespace to match framework/ml/nn" into pi-dev 2018-04-26 09:20:41 +00:00
Mika Raento
a6752780d5 Merge "Update neuralnetworks/*/types.hal to match impl" into pi-dev 2018-04-26 08:12:25 +00:00
TreeHugger Robot
7fa25dee8f Merge "Use configArray for HVAC_POWER_ON" into pi-dev 2018-04-26 02:30:04 +00:00
Scott Randolph
0e3e580249 Merge "Rename EV_CONNECTOR_TYPE enums" into pi-dev 2018-04-26 00:55:57 +00:00
Steve Paik
24139744a5 Use configArray for HVAC_POWER_ON
Bug: 77167122
Test: EmbeddedKitchenSink
Change-Id: I6a178396c3c44c37b33b74b8481ef39b53a36189
2018-04-25 17:53:03 -07:00
Michael Butler
be1066bbe5 [automerger skipped] Relax NeuralNetwork's VTS positive and negative base tests am: af5e03a692
am: e5fe876bc8  -s ours

Change-Id: I015a612424c8bfc8ac10b226a544563fa5b8746e
2018-04-25 17:05:18 -07:00
Michael Butler
e5fe876bc8 Relax NeuralNetwork's VTS positive and negative base tests
am: af5e03a692

Change-Id: Ia9830b7bbd39d692b93265fbeb1f6a395f0b2988
2018-04-25 16:51:12 -07:00
Michael Butler
af5e03a692 Relax NeuralNetwork's VTS positive and negative base tests
There are some NN VTS tests that assume a service is able to generate a
model consisting only of a floating point add operation. However, some
drivers do not support floating point operations. This CL relaxes the
test requirements to allow a test to be skipped if the service does not
support floating point add.

Bug: 77227504
Test: mma
Test: VtsHalNeuralnetworksV1_0TargetTest
Test: https://drive.google.com/open?id=1P-rEzUMK0EoWSrOFuXy46EubpwC3A1cs
Change-Id: Ied49c96af975eff734377b7b7445c6f5e63e117e
(cherry picked from commit 25d9dd7346d995b40e1d370eb9d12bb7e3f03396)
2018-04-25 23:32:09 +00:00
Chia-I Wu
c75e0f0bf9 graphics: allow re-saturation for any legacy dataspace
While our intention is to only re-saturate legacy sRGB, the
re-saturation is usually performed globally by the composer.  To
avoid GPU fallback when, for example, video plays, allow the
re-saturation to be applied on any legacy dataspace.

This also removes the clamping after applying the re-saturation
matrix, allowing the output dataspace to be scRGB.

Bug: 78303195
Bug: 78025845
Test: manual
Change-Id: Ic221401894789fbaf6bad944b49006163238237c
2018-04-25 11:35:39 -07:00
Steve Paik
5fc65ccafc Rename EV_CONNECTOR_TYPE enums
Bug: 78571971
Test: Documentation / naming update
Change-Id: I6ca65a9a745d9f5dd109f5b47a3a4af4d818fe39
2018-04-25 11:09:14 -07:00
jiabin
bad3b28b60 Add vts for microphone enumeration APIs.
Bug: 64038649
Test: run vts --module VtsHalAudioV4_0Target
Change-Id: If75ee585a9d865d010fc7d2a081b930fba022a20
2018-04-25 10:17:29 -07:00
Mika Raento
7e64e7f924 Update neuralnetworks/*/types.hal to match impl
Updates hardware/interfaces/neuralnetworks/1.(0|1)/types.hal to match
the NeuralNetworks.h header in framework/ml/nn. Only comments have
changed.

Updated using framework/ml/nn/tools/sync_enums_to_hal.py.

Change-Id: I0754868ad8acf6e2e0c5b83661d04682febec9b0
Bug: 77604249
Test: checked changes with git diff
Test: mm in $ANDROID_BUILD_TOP
2018-04-25 12:46:33 +01:00
Kevin Rocard
adf9e18c01 Merge changes I2f70f2ec,I9d77a59e,Ied3a657d,Ib6e9d017,I95db94ed, ... into pi-dev
* changes:
  Audio V4: Add missing VTS
  Audio V4: VTS Pause was testing resume
  Audio V4: factorize analyzeStatus
  Audio V4: fix invalid SupportedChannelMasks test
  Audio V4: setMode VTS incorrectly assume 0 was invalid
  Audio V4: XSD device category was missing hearing aid
  Audio V4: some legacy getSupported can return NOT_SUPPORTED
  Audio V4: Improve VTS error messages
2018-04-25 01:21:58 +00:00
Kevin Rocard
d2f6be72ef Audio V4: Add missing VTS
Test: atest VtsHalAudioV4_0TargetTest
Bug: 74037175
Change-Id: I2f70f2ec6d4b1ee015de6b4937832903d945fdeb
Signed-off-by: Kevin Rocard <krocard@google.com>
2018-04-24 10:47:50 -07:00
Roshan Pius
8063dfa9aa Merge "wifi(implementation): Use stub for |read_packet_filter|" into pi-dev 2018-04-24 16:53:09 +00:00
Iris Chang
077a66cdf7 [automerger skipped] VTS: fix RadioHidlTest.getAvailableNetworks issue am: 14ad821b0a -s ours am: 7ace8b81e8 -s ours
am: d7854aef84  -s ours

Change-Id: Iac8b3651a213cc5ca440c6cf06bb625c9fbd2160
2018-04-24 02:08:21 -07:00
Iris Chang
8d20ae2560 [automerger skipped] VTS: fix RadioHidlTest.getAvailableNetworks issue am: 14ad821b0a am: ab2a35a56e am: 51ec70c39e -s ours
am: 30736de122  -s ours

Change-Id: I49b306bf7b1ed0a58c5d9622b2b6ca20b1dd9c71
2018-04-24 02:08:04 -07:00
Iris Chang
d7854aef84 [automerger skipped] VTS: fix RadioHidlTest.getAvailableNetworks issue am: 14ad821b0a -s ours
am: 7ace8b81e8  -s ours

Change-Id: If1d584c181c3b1ff51f2bd9a69dc93470e6c9647
2018-04-24 02:03:52 -07:00
Iris Chang
30736de122 [automerger skipped] VTS: fix RadioHidlTest.getAvailableNetworks issue am: 14ad821b0a am: ab2a35a56e
am: 51ec70c39e  -s ours

Change-Id: I863a86a28b061773c7237e5a14d68e78a43d709b
2018-04-24 02:03:28 -07:00
Iris Chang
51ec70c39e VTS: fix RadioHidlTest.getAvailableNetworks issue am: 14ad821b0a
am: ab2a35a56e

Change-Id: I15b499a96bd73036f33d3c056da69b3fa8300afd
2018-04-24 01:58:58 -07:00
Iris Chang
7ace8b81e8 [automerger skipped] VTS: fix RadioHidlTest.getAvailableNetworks issue
am: 14ad821b0a  -s ours

Change-Id: I18bcb31f812e36c21309713450b2693990c98584
2018-04-24 01:55:24 -07:00
Iris Chang
ab2a35a56e VTS: fix RadioHidlTest.getAvailableNetworks issue
am: 14ad821b0a

Change-Id: Ic8a94dddc6ecc45df85ad3b8e6d74a5ce541ba26
2018-04-24 01:54:56 -07:00
Kevin Rocard
82cef8d3f9 Audio V4: VTS Pause was testing resume
Bug: 74037175
Test: VtsHalAudioV4_0TargetTest
Change-Id: I9d77a59e69452e0891dc4e8e2cc2a14fef4fda41
Signed-off-by: Kevin Rocard <krocard@google.com>
2018-04-23 21:59:44 -07:00
Kevin Rocard
64c3932736 Audio V4: factorize analyzeStatus
This factorization had not been ported from the AOSP patch.
The code is functionally identical.

Test: compile
Bug: 69010523
Change-Id: Ied3a657d7c219b580eb32377789096f6b2f6dc19
Signed-off-by: Kevin Rocard <krocard@google.com>
2018-04-23 21:59:44 -07:00
Wei Wang
a088ab4570 Merge "dumpstate: add interface into rc file" into pi-dev 2018-04-24 04:24:04 +00:00
Eric Laurent
8370b093bc Merge "Audio V4: dump effect HAL using the standard debug()" into pi-dev 2018-04-23 23:09:10 +00:00
Michael Butler
3559309ace Merge "NNAPI: Create VTS _relaxed tests for newly added tests" into pi-dev 2018-04-23 22:35:00 +00:00
Kevin Rocard
cff6813819 Audio V4: fix invalid SupportedChannelMasks test
Test was calling getSupportedSamplingRate instead of channel mask.

Bug: 77307068
Test: atest VtsHalAudioV4_0TargetTest
Change-Id: Ib6e9d017793edfc95853cab0c2955b8c801bc66f
Signed-off-by: Kevin Rocard <krocard@google.com>
2018-04-23 15:28:20 -07:00
Michael Butler
f2036fd441 NNAPI: Create VTS _relaxed tests for newly added tests
New tests were added to V1_0 and V1_1 specs, but they did not have a
"_relaxed" test in V1_1.

This CL updates the 1.1 VTS validation as a followup CL.

Bug: 76434855
Test: mma
Test: NeuralNetworksTest_static
Test: VtsHalNeuralnetworksV1_0TargetTest
Test: VtsHalNeuralnetworksV1_1TargetTest
Change-Id: Ic6b3aeb12a8b90e43cf082c78442af7ec7a1018f
2018-04-23 12:51:03 -07:00
TreeHugger Robot
e0050178e6 Merge "Deprecate nfc@1.0 for P." into pi-dev 2018-04-23 18:21:15 +00:00
Steven Moreland
db33cf2552 Deprecate nfc@1.0 for P.
nfc@1.0 requires a conf file (libnfc-nci.conf) in order to work.
Since this file has no schema, it is a system<->vendor violation
and must be placed on the system image, however this makes the
system image non-generic.

nfc@1.1 contains this configuration in the interface, and so it
can be used entirely without creating a Treble violation.

Test: P-launching devices have nfc@1.1
Bug: 72080121
Change-Id: I7a99eb7cd5e577be0c70b4c5124f28fa471717e6
2018-04-23 09:30:37 -07:00
TreeHugger Robot
63abd8fdbc Merge changes I41328afc,Ie543519f into pi-dev
* changes:
  Audio: setParam improve status_t to Result consistency
  Audio: make core/4.0/default/Util.h version dependant
2018-04-21 19:24:52 +00:00
Kevin Rocard
dea4c3803f Audio V4: setMode VTS incorrectly assume 0 was invalid
Thus the test was always incorrectly failing.
Also improve the test error messages.

Bug: 77307068
Test: VtsHalAudioV4_0TargetTest
Change-Id: I95db94ed99f7ca32af35422e36a95084e72279d8
Signed-off-by: Kevin Rocard <krocard@google.com>
2018-04-21 01:32:34 -07:00
Kevin Rocard
92dcce0924 Audio V4: XSD device category was missing hearing aid
Bug: 77307068
Test: atest VtsHalAudioV4_0TargetTest
Change-Id: I9de9b826d01fe90c1a7d16631d0f808b29ad4775
Signed-off-by: Kevin Rocard <krocard@google.com>
2018-04-21 01:32:34 -07:00
Kevin Rocard
6512b60502 Audio V4: some legacy getSupported can return NOT_SUPPORTED
Legacy implementation through getParameter can not return a status_t.
This is problematic for
 - getSupportedChannelMasks(format)
 - getSupportedSampleRate(format)
as they should be able to return NOT_SUPPORTED if they do not support
the provided format.

In that case, allow the legacy implementation to return an empty string
that will be converted to NOT_SUPPORTED.

Test: atest VtsHalAudioV4_0TargetTest
Bug: 77307068
Change-Id: I78c37caf059885e3d33e6a308876dbc0e3ef7145
Signed-off-by: Kevin Rocard <krocard@google.com>
2018-04-21 01:32:34 -07:00
Kevin Rocard
16d6547901 Audio V4: Improve VTS error messages
This does not change the test logic or constraints.
It only improves the error messages.

Bug: 77307068
Test: atest VtsHalAudioV4_0TargetTest
Change-Id: I6c79ddd014d4ab8aba4f1d0b918888f83dfb63ad
Signed-off-by: Kevin Rocard <krocard@google.com>
2018-04-21 01:32:34 -07:00
Kevin Rocard
fba21730f8 Audio: setParam improve status_t to Result consistency
The rest of the API (*::analyseStatus) returns NOT_SUPPORTED
when the legacy API returns -ENOSYS.

setParameter legacy -> treble shim did not follow this
conversion due to the legacy API stating that for get_paramers,
-ENOSYS should be returned if
"the implementation does not accept a parameter change while the
 output is active but the parameter is acceptable otherwise",
aka INVALID_STATE.

Thus setParameter shim used to return
 - OK for OK
 - INVALID_STATE for -ENOSYS
 - INVALID_ARGUMENTS for everything else

This leads to several problems:
 - an implementation of the legacy API can not report NOT_SUPPORTED
 - it is inconsistent with the rest of the status_t conversion methods
 - shim methods implemented over getParameter can not distinguish
   between different failures as required by the .hal documentation

Most importantly, on the system side, the Result is transformed to a
status_t again but without any special logic for methods wrapping
getParameter in the shim.
This can not be changed as the system can not know which methods
are implemented with a legacy wrapper under the Treble API boundary.

Thus setParam now converts status_t to Result in the same way
as all the other shim methods.

This patch is the second half of I41204c0807d2bd4675e941771cbc9a43d7d14855
that was reverted due to a merge conflict.

Bug: 72873273
Bug: 69811500
Bug: 69010523
Test: playback and record for media and voice call
Original-Change-Id: I41204c0807d2bd4675e941771cbc9a43d7d14855
Change-Id: I41328afce56ce31d4a26159ca2d4b16d14cce05b
Signed-off-by: Kevin Rocard <krocard@google.com>
2018-04-20 17:05:17 -07:00
Kevin Rocard
147a454bb2 Audio: make core/4.0/default/Util.h version dependant
This patch does not have any functional change.
It refactors Util.h to make it version dependant.
This is needed in the next patch to add a helper
that uses HIDL types.

This patch is the fixed first half of
I41204c0807d2bd4675e941771cbc9a43d7d14855
that was reverted due to a merge conflict.

Bug: 72873273
Bug: 69811500
Bug: 69010523
Test: playback and record for media and voice call
Original-Change-Id: I41204c0807d2bd4675e941771cbc9a43d7d14855
Change-Id: Ie543519fa0dca62486b75f42bb0c8a93d6cad3c3
Signed-off-by: Kevin Rocard <krocard@google.com>
2018-04-20 17:05:15 -07:00
Roshan Pius
d3536bf9ed wifi(implementation): Use stub for |read_packet_filter|
Use the stub to take care of vendors who don't implement the new HAL
functionality.

Note: This is just an internal cleanup to be consistent with other
functions.

Bug: 73804303
Test: Compiles
Change-Id: I393194772f35a3620c5acd4d5c3b5a6d072cd507
2018-04-20 15:47:46 -07:00