Commit graph

17845 commits

Author SHA1 Message Date
Nathan Harold
68bd27a397 Add Some Buffer Lines to Avoid Merge Conflicts
am: 1fd6b723df

Change-Id: I8259a5012113d2c85d81be63249b50e214c02770
2020-01-10 16:07:10 -08:00
Nathan Harold
1fd6b723df Add Some Buffer Lines to Avoid Merge Conflicts
Because other teams are changing HAL hashes downstream,
the git conflict resolution algorithm detects conflicts
due to changes in adjacent lines, even though they aren't
real conflicts. This CL adds buffer lines to convince git
and by extension the auto-merger that the changes may be
safely merged.

Note: these should be removed prior to release.

Bug: 144366823
Test: make (non-functional change)
Merged-In: Ie8785da99ce68e1db85face30c6c633385ecb085
Change-Id: Ie8785da99ce68e1db85face30c6c633385ecb085
(cherry picked from commit 857821c288)
2020-01-10 23:07:05 +00:00
Automerger Merge Worker
db335ad7fb Add quantized LSTM op. am: 232cfebd5b am: f3c5bf1cc8
Change-Id: Id65be5918a4443aed80d5fc1b62eda3b7cf0c404
2020-01-10 21:01:03 +00:00
Viet Dang
f3c5bf1cc8 Add quantized LSTM op.
am: 232cfebd5b

Change-Id: I5ad0d25f2ce99cf452c9d485516b8f2323325443
2020-01-10 12:48:54 -08:00
Steven Moreland
1c26978dd1 vibrator vts: use CompositePrimitives enum_range
Bug: 143992652
Test: TH (added TEST_MAPPING now)

Change-Id: If36ba0d2fa41db1b05bb1d65e6ee062b22c1b564
2020-01-10 19:27:14 +00:00
Eric Laurent
2c75ca6b27 Audio HAL: Add API to attach an effect to a device
Add a method to IDevice interface allowing the attachement of an
audio effect to an audio device.
This is used when an audio effect is implemented below the HAL (e.g by an audio DSP)
and is attached/enabled when a particular sink(e.g speaker) or source(e.g mic) device
is selected.

Bug: 136294538
Test: make
Change-Id: I73d78c4f234fd80443a1cb3772c2d65457968652
Merged-In: I73d78c4f234fd80443a1cb3772c2d65457968652
2020-01-10 11:16:42 -08:00
Eric Laurent
d33e6935e0 Audio effect HAL: Add device ID to createEffect API
Add the possibility to specify a target audio device when
creating an audio effect by passing its audio port handle
to createEffect API.

To attach an effect to a device, the framework will use
session ID AudioSessionConsts.DEVICE and provide a valid
AudioPortHandle as device ID.

Bug: 136294538
Test: make
Change-Id: Ic697eeafbd5df6800ad4c7fd9e0698e3d8e3beae
Merged-In: Ic697eeafbd5df6800ad4c7fd9e0698e3d8e3beae
2020-01-10 11:16:32 -08:00
Eric Laurent
5f9bb1b027 audio: add audio session for device effects
Add specific audio session ID for effects applied to a
particular audio device.

Bug: 136294538
Test: make
Change-Id: Iea3e3a07f404e1075844422c740d2dc4d5163598
Merged-In: Iea3e3a07f404e1075844422c740d2dc4d5163598
2020-01-10 11:16:12 -08:00
Viet Dang
232cfebd5b Add quantized LSTM op.
Bug: 144841609

Test: NeuralNetworksTest_static

Change-Id: I8aab51695382211e003d8fc442d33bae3006dc13
Merged-In: I8aab51695382211e003d8fc442d33bae3006dc13
(cherry picked from commit c8b0cd33b9)
2020-01-10 11:15:14 +00:00
Automerger Merge Worker
6ebbd1fcb9 Merge "Update health 2.1 readme for file_contexts" am: a676535934 am: 29812d24ae
Change-Id: I321e36cacc2d80246296c3fa57c3fd28d89d8ab3
2020-01-10 10:32:02 +00:00
Yifan Hong
29812d24ae Merge "Update health 2.1 readme for file_contexts"
am: a676535934

Change-Id: Ife24c7407631472a283f1ca3844a27c803637fb8
2020-01-10 02:20:23 -08:00
Yifan Hong
a676535934 Merge "Update health 2.1 readme for file_contexts" 2020-01-10 10:17:14 +00:00
Jeff Tinker
542290ad55 Fix tests for devices that don't have drm@1.2 services
This CL fixes a null pointer dereference that is triggered
when VtsHalDrmV1_2TargetTest is run on a device that
doesn't implement a drm@1.2 vendor service, for any
drm scheme where a vts vendor module is provided. In this
case the test will be skipped.

test: VtsHalDrmV1_2TargetTest

bug:145965256
Change-Id: I43c87db9b560d2024c0fb15cd44d106067ed48ae
2020-01-10 01:34:55 +00:00
Yifan Hong
ca44707aea Update health 2.1 readme for file_contexts
-impl file needs to be marked as same_process_hal_file
for charger to work.

Test: none
Change-Id: I998493949284362fbd1dcb8e2a1d48958feb1324
2020-01-09 17:20:10 -08:00
Automerger Merge Worker
be0f9bb836 Add Indication Filter for Registration Failure am: bacb8216d5 am: ebc2d054f2
Change-Id: I51caac2b66d4b166612feee5f401b7bc40b81471
2020-01-10 00:50:52 +00:00
Nathan Harold
ebc2d054f2 Add Indication Filter for Registration Failure
am: bacb8216d5

Change-Id: I1f47b0f0cdd9ae5bf3fdb18deb9f23187601ab23
2020-01-09 16:40:10 -08:00
Nathan Harold
bacb8216d5 Add Indication Filter for Registration Failure
-Add IndicationFilter support for Radio 1.5.
-Add a new flag for disabling Registration Failure
 indications.

Bug: 146805410
Test: make && atest VtsHalRadioV1_5TargetTest
Change-Id: Idcfb3ed64624fe7549b6fa0e434f24ca0f5d42f1
2020-01-09 10:42:40 -08:00
Automerger Merge Worker
66fb6492f5 default drm hidl: Fix decrypt destination base ptr am: d79abbb0d3 am: 86828796ac am: 44fa9a5cf0 am: 0e8630788f am: 119b9ea01d am: 43f65e0f60
Change-Id: I66ebe64f3387a8b46eb745c6b037877605e05945
2020-01-09 05:21:10 +00:00
Automerger Merge Worker
43f65e0f60 default drm hidl: Fix decrypt destination base ptr am: d79abbb0d3 am: 86828796ac am: 44fa9a5cf0 am: 0e8630788f am: 119b9ea01d
Change-Id: I3aa8e6635baf17b395bd54e03fb6e59160bc9c7f
2020-01-09 05:04:00 +00:00
Automerger Merge Worker
119b9ea01d default drm hidl: Fix decrypt destination base ptr am: d79abbb0d3 am: 86828796ac am: 44fa9a5cf0 am: 0e8630788f
Change-Id: I73b41a1aebe7dec987e637ca30c9d65b1aedc41e
2020-01-09 04:51:59 +00:00
Automerger Merge Worker
0e8630788f default drm hidl: Fix decrypt destination base ptr am: d79abbb0d3 am: 86828796ac am: 44fa9a5cf0
Change-Id: Ie67b811fe2a172d9a33458ed5c23578c71a0a221
2020-01-09 04:33:04 +00:00
Automerger Merge Worker
44fa9a5cf0 default drm hidl: Fix decrypt destination base ptr am: d79abbb0d3 am: 86828796ac
Change-Id: I4fac71fd9946d37a7a3b1d32a611f007de3e5303
2020-01-09 04:14:08 +00:00
Automerger Merge Worker
86828796ac default drm hidl: Fix decrypt destination base ptr am: d79abbb0d3
Change-Id: Ifaa69ef0ed98f90a42a66b7b64ef9d61457af107
2020-01-09 03:59:10 +00:00
Automerger Merge Worker
c34bb73c70 [DO NOT MERGE] Fix SHAs in IRadio 1.5 am: 755bf306ef am: 193716eee2
Change-Id: Ia07b60fc539a2e1bd2d723b68fc5a1d7baf4ddae
2020-01-09 01:16:34 +00:00
Nathan Harold
193716eee2 [DO NOT MERGE] Fix SHAs in IRadio 1.5
am: 755bf306ef

Change-Id: Ic5c021ae3e0066e05ba4fc52aaf890edf75bd307
2020-01-08 17:02:47 -08:00
Nathan Harold
755bf306ef [DO NOT MERGE] Fix SHAs in IRadio 1.5
Tweak files in AOSP and update SHAs to match internal master.

Bug: 147379351
Test: update-makefiles
Change-Id: Iac00853bc00c003848b3d45ebb19d15c4f6fba0b
2020-01-08 23:48:01 +00:00
Automerger Merge Worker
c5ef701aae Merge "Add audio stream and usage for virtual assistant" am: 653c876b5b am: d271a631d0
Change-Id: I3ec66f2331f1d7fe51dcf93068696089dfbce11c
2020-01-08 22:46:30 +00:00
Baekgyeong Kim
d271a631d0 Merge "Add audio stream and usage for virtual assistant"
am: 653c876b5b

Change-Id: Ie568e4ef23a687249fd5bfbf9f27d7de5a09bf9e
2020-01-08 14:29:45 -08:00
Treehugger Robot
653c876b5b Merge "Add audio stream and usage for virtual assistant" 2020-01-08 22:23:27 +00:00
Baekgyeong Kim
09e665e61c Add audio stream and usage for virtual assistant
New stream type: AUDIO_STREAM_ASSISTANT
This is intended to be used by a virtual assistant like
Google Assistant, Bixby, etc.

The audio stream has own volume alias and the volume
does not change by volume changes of other streams.

Bug: 123745215
Test: make
Change-Id: I3696d8fba32070954cc6a330574af8507fea7a74
Merged-In: I3696d8fba32070954cc6a330574af8507fea7a74
2020-01-08 11:53:59 -08:00
Automerger Merge Worker
e876443913 Merge "[vts-core] add VtsHalAudioEffectV*_0TargetTest to vts-core" am: 4472878a42 am: 96dd61d29b
Change-Id: I8841dfe4b46102173e64755dfe36b09e32af6ee5
2020-01-08 03:25:43 +00:00
nelsonli
96dd61d29b Merge "[vts-core] add VtsHalAudioEffectV*_0TargetTest to vts-core"
am: 4472878a42

Change-Id: Icc9fd217f09b8a1f31efde01f1fe9c00e845e90d
2020-01-07 19:09:51 -08:00
Treehugger Robot
4472878a42 Merge "[vts-core] add VtsHalAudioEffectV*_0TargetTest to vts-core" 2020-01-08 02:12:09 +00:00
Automerger Merge Worker
ef9e0c98d9 Merge "vibrator: use package as name" am: 91a5aa4ea2 am: 8aa0dd830f
Change-Id: I3aa4a55b19914066198c44f28bef0f4232ab8f3d
2020-01-07 23:07:39 +00:00
Steven Moreland
8aa0dd830f Merge "vibrator: use package as name"
am: 91a5aa4ea2

Change-Id: I1f682f4e93d7d77b262faf59e955116443cfbcaf
2020-01-07 14:48:51 -08:00
Steven Moreland
91a5aa4ea2 Merge "vibrator: use package as name" 2020-01-07 22:43:01 +00:00
Automerger Merge Worker
f6644831b5 Merge changes from topic "quant_signed_tests" am: 714f0f5cb1 am: 6685773b29
Change-Id: Ifca5d3fd7be00ae31b4dcc810ebff70488ee2abb
2020-01-07 22:26:58 +00:00
Automerger Merge Worker
8ca5120f74 Add quant8 signed generated tests am: da779f322c am: 06e5ab361a
Change-Id: I752c9c316b895af1639014e4dde7b7f7f7ed2062
2020-01-07 22:26:55 +00:00
Lev Proleev
6685773b29 Merge changes from topic "quant_signed_tests"
am: 714f0f5cb1

Change-Id: I137ece00b8e266da48c269e51add237dd997ec41
2020-01-07 14:07:45 -08:00
Lev Proleev
06e5ab361a Add quant8 signed generated tests
am: da779f322c

Change-Id: Ic8b4d2922e2b50bb8132677e10fe4ef82e613d9c
2020-01-07 14:07:36 -08:00
Treehugger Robot
714f0f5cb1 Merge changes from topic "quant_signed_tests"
* changes:
  NNAPI: Update docs for ops with signed quantization
  Add quant8 signed generated tests
2020-01-07 21:28:31 +00:00
Automerger Merge Worker
29352779b3 Merge "Add a Registration Failure indication to IRadio" am: f1a6e2e828 am: e4533e4090
Change-Id: I5fb810724abf97a833e921818b863e377f359cb4
2020-01-07 20:31:54 +00:00
Nathan Harold
e4533e4090 Merge "Add a Registration Failure indication to IRadio"
am: f1a6e2e828

Change-Id: If680ff63e106522d1a4edcf7ab05b19841163313
2020-01-07 12:11:38 -08:00
Nathan Harold
f1a6e2e828 Merge "Add a Registration Failure indication to IRadio" 2020-01-07 19:57:30 +00:00
Automerger Merge Worker
882098eb90 Add exceptions to the signed quantization coupling tests am: 673fdcf4e6 am: 0e2a69793e
Change-Id: Ic58310208c5336f950bdba70b110d6a722b1d56e
2020-01-07 16:20:22 +00:00
Lev Proleev
0e2a69793e Add exceptions to the signed quantization coupling tests
am: 673fdcf4e6

Change-Id: I37e76c28b8c7e2a4dbdabe439b8a1f79e78429f0
2020-01-07 08:04:56 -08:00
Lev Proleev
c9d7f1cdc4 NNAPI: Update docs for ops with signed quantization
types.hal files are generated from current types.spec.

Bug: 136735770
Test: mma
Change-Id: Ide24606f8b1d5e755a71d46f230409942d8df7e9
Merged-In: Ide24606f8b1d5e755a71d46f230409942d8df7e9
(cherry picked from commit eb7f175613)
2020-01-07 13:36:03 +00:00
Lev Proleev
da779f322c Add quant8 signed generated tests
Fixes ValidateModel test for AXIS_ALIGNED_BBOX_TRANSFORM.

Bug: 136735770
Test: VtsHalNeuralnetworksV1_3TargetTest
Change-Id: Ie2959ba7258d8106d5b3dd36970181519b75e3b3
Merged-In: Ie2959ba7258d8106d5b3dd36970181519b75e3b3
(cherry picked from commit 16e8c9cc02)
2020-01-07 13:36:00 +00:00
Lev Proleev
673fdcf4e6 Add exceptions to the signed quantization coupling tests
Main commit is in frameworks/ml/nn. This one only renames
testModel.hasQuant8AsymmOperands() to
testModel.hasQuant8CoupledOperands().

Bug: 143935412
Bug: 143934188
Bug: 143935353
Bug: 143934467
Bug: 143934184
Test: quantization coupling tests in CTS and VTS
Change-Id: I0f7c331c355fe61ee06605786f09bc1ca7cdef57
Merged-In: I0f7c331c355fe61ee06605786f09bc1ca7cdef57
(cherry picked from commit 6a1d5e405f)
2020-01-07 13:35:58 +00:00
Jindong
70e33216a6 VHAL: fix CTS CarPropertyManagerTest#testRegisterCallback
This case asserts property PERF_VEHICLE_SPEED can have different
number event happened with different event rate:
SENSOR_RATE_NORMAL or SENSOR_RATE_FASTEST.
But CarPropertyManager.java says:
  Rate has no effect if the property has one of the following change modes
     *   CarPropertyConfig#VEHICLE_PROPERTY_CHANGE_MODE_STATIC
     *   CarPropertyConfig#VEHICLE_PROPERTY_CHANGE_MODE_ONCHANGE
So modify PERF_VEHICLE_SPEED change mode to CONTINUOUS.

Test:
run cts -m CtsCarTestCases -t android.car.cts.CarPropertyManagerTest#testRegisterCallback

Change-Id: I99e3d672d052a5cde9aaad78221caac510e81b40
Signed-off-by: Jindong <jindong.yue@nxp.com>
2020-01-07 10:25:37 +08:00