Commit graph

29566 commits

Author SHA1 Message Date
Michael Butler
c82058cc67 Merge "Cleanup NN callback error handling" 2020-12-21 18:59:10 +00:00
Mikhail Naganov
e222bebac8 Merge "Audio VTS: Improve stability, update config validation test" am: 65dc8832cf am: 8929cd8573 am: c715cbe403
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1531970

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I176654060090138d484e89091dd651aa255565c3
2020-12-21 18:42:55 +00:00
Treehugger Robot
90ea1579e2 Merge "Revise keymint_tags.h" am: 2528ddcab2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1533203

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4a03d4caa6a7641ede077511a3cc6da7e55475bd
2020-12-21 18:41:30 +00:00
Treehugger Robot
268ef54b1a Merge "Change KeyParameters to use a union." am: d389d1659a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1520082

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic4e01b51cd86c965b5869bcf26fba95e9a74465a
2020-12-21 18:37:15 +00:00
Mikhail Naganov
c715cbe403 Merge "Audio VTS: Improve stability, update config validation test" am: 65dc8832cf am: 8929cd8573
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1531970

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I35cd0edc72fda8e0a1b86a4e3a29c7962916ed58
2020-12-21 18:29:55 +00:00
Treehugger Robot
2528ddcab2 Merge "Revise keymint_tags.h" 2020-12-21 18:11:08 +00:00
Treehugger Robot
d389d1659a Merge "Change KeyParameters to use a union." 2020-12-21 18:10:58 +00:00
Mikhail Naganov
8929cd8573 Merge "Audio VTS: Improve stability, update config validation test" am: 65dc8832cf
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1531970

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I324c16680e9f9e6d080e42df15e3b7106963f7eb
2020-12-21 17:55:22 +00:00
Mikhail Naganov
65dc8832cf Merge "Audio VTS: Improve stability, update config validation test" 2020-12-21 17:28:31 +00:00
Midas Chien
3b069c909c composer: vts: allocate buffer larger or equal to crop size
Ensure buffer size larger than crop size.

Bug: 175028291
Test: VtsHalGraphicsComposerV2_4TargetTest on Pixel 4, 5
Change-Id: I6528ac6989ca557d9f578b0119715a6688bb6d5d
2020-12-21 21:35:49 +08:00
Treehugger Robot
f468b74002 Merge "Keymint: Use ndk_platform." am: dfe843477b am: 24f8ba41c4 am: c670b8d592
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1532211

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6195d05d61cc03dc409e67b74b322367488dd894
2020-12-19 13:46:41 +00:00
Treehugger Robot
c670b8d592 Merge "Keymint: Use ndk_platform." am: dfe843477b am: 24f8ba41c4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1532211

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9e5e0c12977b5cefe4a1df68a0dfb64192af9f12
2020-12-19 12:54:01 +00:00
Treehugger Robot
24f8ba41c4 Merge "Keymint: Use ndk_platform." am: dfe843477b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1532211

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I317383dbc4d6be31f3bb71523a402847c4132e89
2020-12-19 12:34:30 +00:00
Treehugger Robot
dfe843477b Merge "Keymint: Use ndk_platform." 2020-12-19 12:22:37 +00:00
Janis Danisevskis
5ba093377c Revise keymint_tags.h
* replace NullOr with std::optional.
* Add mising tag.
* Undefine helper macros so that keymint_tags.h can be used together
  with keymaster_tags.h
* Check if KeyParameterValue variant matches KeyParameterTag in
  accessors.

Test: VtsAidlKeyMintTargetTest
Change-Id: I6c951071f30fd27c8c21a2e8cc86f421a3bc37d9
2020-12-18 08:34:20 -08:00
Shawn Willden
83fa6413ac Change KeyParameters to use a union.
AIDL now supports union types.  This CL changes KeyParameter to use
one.

Test: VtsAidlKeyMintTargetTest
Change-Id: I5112611b161e3de1ea86105ea3c7ed0912036a7b
2020-12-18 08:38:28 -07:00
Kai Shi
2ca7a11810 Add voip optimization HAL API
Test: compilation and halutil test
Bug: 166311728
Change-Id: I3173e733abe158e1b009ed8378d1963ca3b8b8e8
2020-12-17 14:15:12 -08:00
Guru Nagarajan
3413e6acd4 Merge "Added IAudioControl#onDevicesToMuteChange" 2020-12-17 22:01:20 +00:00
Anthony Stange
100aa5eda1 Add new contexthub HAL 1.2 methods to default impl
Bug: 166846988
Test: Run VTS against default HAL
Change-Id: I158a49e54f340a2ba25f79894d6ec465070326f8
2020-12-17 16:33:55 -05:00
Anthony Stange
6c77c35406 Add stubs for new contexthub v1.2 methods
Bug: 166846988
Test: compile
Change-Id: Iccf32340f9fa024a26832090f1e0835198546946
2020-12-17 16:33:55 -05:00
Anthony Stange
e351e3b321 Update Contexthub HAL 1.2
Update Contexthub HAL 1.2 to support passing permissions information
about host apps and nanoapps to the HAL and contexthub framework.

Bug: 166846988
Test: hidl-gen && Run VTS against default HAL
Change-Id: I483cb066b3228c4a80bab8f12f8bfee2610c9e6b
2020-12-17 16:33:51 -05:00
Treehugger Robot
9c70ad02b1 Merge "Add android-5.10 support for S" am: 69c290564a am: d694491190 am: 14172a0744
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1531285

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5b7a414b08abc9a57338af40a387dfbd45f63528
2020-12-17 21:16:43 +00:00
Treehugger Robot
14172a0744 Merge "Add android-5.10 support for S" am: 69c290564a am: d694491190
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1531285

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1c8bdfcf758b38cc1b4929792c794ccd497aae71
2020-12-17 20:48:21 +00:00
Treehugger Robot
d694491190 Merge "Add android-5.10 support for S" am: 69c290564a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1531285

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib081b232aa2e3ce8f8e8d7fd04ecb59ca2e27d11
2020-12-17 20:31:56 +00:00
Treehugger Robot
69c290564a Merge "Add android-5.10 support for S" 2020-12-17 20:12:00 +00:00
Michael Butler
11761e37a8 Remove 'blocking' param from NN ResilientPreparedModel and *Buffer
This change removes the 'blocking' parameter for the
ResilientPreparedModel::Factory and ResilientBuffer::Factory. The
'blocking' parameter is only useful for ResilientDevice::Factory, which
behind the scenes chooses between the HIDL calls IDevice::getService and
IDevice::tryGetService. The equivalent calls for IPreparedModel and
IBuffer are not used, as both are created from the IDevice object.

This change also modifies the ResilientDevice's device recovery
behavior. Prior to this change, ResilientDevice's recovery mechanism had
the following behavior:
* attempt to call a function
* if the function did not return a DEAD_OBJECT error, return
* if the function returned a DEAD_OBJECT error, attempt to recover the
  device
* whether or not the recovery succeeded, call the function again

This CL changes the behavior so that if device recovery fails,
ResilientDevice will not call the function the second time.

Bug: N/A
Test: mma
Change-Id: Icf37d05c884c740178324fcd046ea56914ef7d44
2020-12-17 11:09:15 -08:00
Michael Butler
98ed9baf5d Cleanup NN callback error handling
This CL introduces a new templated class CallbackValue to handle HIDL
"return value" callbacks in a terser and more readable way.

This CL also introduces a new macro HANDLE_HAL_STATUS to return from the
current function when an error is present with the ability to append a
more descriptive error message.

Finally, this CL changes the behavior of synchronous executions. Prior
to this CL, IPreparedModel fell back to an asynchronous execution if the
synchronous execution was allowed and failed. This change instead
returns a failure if synchronous execution is allowed and fails.

Bug: 173084343
Test: mma
Change-Id: I62714a932e71dfc77401bbcb9eaaaf3d94fb9707
2020-12-17 11:01:14 -08:00
Janis Danisevskis
24c0470408 Keymint: Use ndk_platform.
Test: N/A
Change-Id: I7e97d9d475a639cfe92c9e6b01689c9ff80d2abc
2020-12-17 11:34:59 -07:00
Oscar Azucena
b8e5cd08bd Added IAudioControl#onDevicesToMuteChange
Added new API and parceable for informing the HAL when to mute and
unmute audio for automotive targets. Also added default implementation
to log information passed on.

Bug: 173141906
Test: atest VtsAidlHalAudioControlTest
Change-Id: I4c20320d33417616eef7a980a375ab9303b43eab
2020-12-16 18:00:05 -08:00
TreeHugger Robot
e898720840 Merge changes from topic "fixCoexRestrictions"
* changes:
  Add VTS test for IWifiChip::setCoexUnsafeChannels
  [WifiCoex] Add enum for wifi coex restrictions
2020-12-17 00:16:11 +00:00
Steven Moreland
65020a8e27 Merge "Update OWNERS for 2020" am: a9cfd015bf am: f1715f4b0b am: 1969d5ab7e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1532199

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9e2e1eb1f98e8068ec89ac9c037688361046da1c
2020-12-16 23:57:08 +00:00
Mikhail Naganov
79903fea44 Audio VTS: Improve stability, update config validation test
Major challenge: the configuration of HAL tests
depends on the APM XML configuration file which may be
invalid. The code that reads the configuration
has been updated to avoid crashes when the config
is invalid.

In CheckConfig_audioPolicyConfigurationValidation the
dependency on the config parser was removed. Previously,
a failure to parse the config by the config parser would
lead to the test being skipped, which isn't correct
as it must fail in this case.

Minor fixes to V7 tests to pass on a real life legacy HAL.

Bug: 36733185
Test: run VtsHalAudioV7_0TargetTest on a device with V6
Test: run VtsHalAudioV7_0TargetTest on a device with
      a side-loaded V7 and invalid APM config file
Test: run VtsHalAudioV7_0TargetTest on a device with
      a side-loaded V7
Change-Id: I746339ff69ab455dc64eef9a17827d047b357329
2020-12-16 15:30:28 -08:00
Steven Moreland
1969d5ab7e Merge "Update OWNERS for 2020" am: a9cfd015bf am: f1715f4b0b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1532199

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I47f8ba073a0806712d4420e12ce62265de31c432
2020-12-16 23:25:04 +00:00
Steven Moreland
f1715f4b0b Merge "Update OWNERS for 2020" am: a9cfd015bf
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1532199

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3de96b97b85c9883857ed4721ac1bda086c588e7
2020-12-16 23:00:57 +00:00
Steven Moreland
a9cfd015bf Merge "Update OWNERS for 2020" 2020-12-16 22:19:25 +00:00
Treehugger Robot
9df6794936 [automerger skipped] Merge changes from topic "aosp-default-wrapper" am: dbb1258329 am: ca4161df7f am: 899c4dc070 -s ours
am skip reason: Change-Id Idf36dbac398efbc03bd6da68c79f6fb1ddc24e9c with SHA-1 35a3a77811 is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1530606

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I548b7645a3c889e7c0a38b2735513af1b9504a4e
2020-12-16 21:39:57 +00:00
Mikhail Naganov
507c31523c [automerger skipped] audio: Update default effect HAL wrapper to support V7 am: f363ed4f96 am: 3fe3f23a47 am: 423868c14f -s ours
am skip reason: Change-Id I72389c8d564596bef22b47dfdcb2e77d636ef0a3 with SHA-1 9036edac04 is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1530605

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifef56e686a32fc12c1e4f0bfdd245b2f7f6157ef
2020-12-16 21:39:56 +00:00
Mikhail Naganov
5285dd2b1b [automerger skipped] audio: Update default wrapper to support V7 am: e1a9c8f8b8 am: 5efd34043e am: 8951f51cd0 -s ours
am skip reason: Change-Id I0e42fe1279912ffa78ce40c69f6aa2054e84d385 with SHA-1 77d6f101e7 is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1530604

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8ac97b49aa8c79b16c263c7fe8e2b910bfbdc76a
2020-12-16 21:39:55 +00:00
Mikhail Naganov
4c93199ffc [automerger skipped] audio: Extend HidlUtils for the default wrapper needs am: b52e93f516 am: 2dfe070154 am: 33ff025bd7 -s ours
am skip reason: Change-Id I93c482eeaf08442271be2656693be5395ca53762 with SHA-1 7236d0760a is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1530603

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie06e7ddfa678ff0501f39aab34504fc7409defb5
2020-12-16 21:39:53 +00:00
Treehugger Robot
899c4dc070 Merge changes from topic "aosp-default-wrapper" am: dbb1258329 am: ca4161df7f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1530606

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I846c9e1a2d5570f84d41d132c5cc10c50ffefe36
2020-12-16 21:06:49 +00:00
Mikhail Naganov
423868c14f audio: Update default effect HAL wrapper to support V7 am: f363ed4f96 am: 3fe3f23a47
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1530605

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I01c8ae0708fb182399021b2adb0e4f290179d963
2020-12-16 21:06:47 +00:00
Mikhail Naganov
8951f51cd0 audio: Update default wrapper to support V7 am: e1a9c8f8b8 am: 5efd34043e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1530604

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib47395cdeec54c56d98921010c6a560c33c67342
2020-12-16 21:06:44 +00:00
Mikhail Naganov
33ff025bd7 audio: Extend HidlUtils for the default wrapper needs am: b52e93f516 am: 2dfe070154
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1530603

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib8c53de064b906e118a8a04d58d3b3c281d0bc37
2020-12-16 21:06:42 +00:00
Treehugger Robot
ca4161df7f Merge changes from topic "aosp-default-wrapper" am: dbb1258329
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1530606

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9d8752d7ae3e70f93040565252222eb5ad5551be
2020-12-16 20:54:06 +00:00
Mikhail Naganov
3fe3f23a47 audio: Update default effect HAL wrapper to support V7 am: f363ed4f96
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1530605

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I825d9c269a8136803a49be473c3bc061bfbac066
2020-12-16 20:54:03 +00:00
Mikhail Naganov
5efd34043e audio: Update default wrapper to support V7 am: e1a9c8f8b8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1530604

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If05857dbab8f961fd8cb0f7daa6a6c5246422b7e
2020-12-16 20:54:00 +00:00
Mikhail Naganov
2dfe070154 audio: Extend HidlUtils for the default wrapper needs am: b52e93f516
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1530603

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia686c7ede8e9d938281fa660403be220f08c8f49
2020-12-16 20:53:09 +00:00
Treehugger Robot
dbb1258329 Merge changes from topic "aosp-default-wrapper"
* changes:
  HidlUtils: remove temporary conversion functions
  audio: Update default effect HAL wrapper to support V7
  audio: Update default wrapper to support V7
  audio: Extend HidlUtils for the default wrapper needs
2020-12-16 20:05:07 +00:00
Steven Moreland
7479f38654 Update OWNERS for 2020
- remove ex-Android (yim@)
- add devinmoore@ (new native API counciler)
- cleanup format

Bug: N/A
Test: N/A
Change-Id: I23400850e2fbbeae95c7eeb9241f69b0c05c8fd4
2020-12-16 18:09:12 +00:00
Hayden Gomes
65d1029e60 Merge "Adding IAudioControl#onDevicesToDuckChange" 2020-12-16 18:02:49 +00:00