Commit graph

5153 commits

Author SHA1 Message Date
Automerger Merge Worker
5687a73d9c DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: ead3ab68fe
Change-Id: I104d6135b62c9367a6156f657370ad307fcdc92c
2020-01-16 18:34:43 +00:00
Xin Li
ead3ab68fe DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master
Bug: 146167222
Change-Id: I77a0b3f1ce48814aad684864c750efdd26e90e42
2020-01-15 15:57:12 -08:00
Automerger Merge Worker
6e32a78e12 Merge "Audio HAL: Add API to attach an effect to a device" am: 2d0682b212 am: e16c3ebe00
Change-Id: Idcd89be78d5c4470eb8958f5bf1e7f293f83580a
2020-01-13 22:06:07 +00:00
Automerger Merge Worker
d252c69d3b Merge "Audio effect HAL: Add create effect API with device ID" am: 4e018cf039 am: 51c5e608ff
Change-Id: I43afddcf5dea43a26bbb24910237bfba6f87135c
2020-01-13 22:05:37 +00:00
Eric Laurent
e16c3ebe00 Merge "Audio HAL: Add API to attach an effect to a device"
am: 2d0682b212

Change-Id: I98563a62c01e582591bcaa8db7d501ae771fde1b
2020-01-13 13:57:35 -08:00
Eric Laurent
51c5e608ff Merge "Audio effect HAL: Add create effect API with device ID"
am: 4e018cf039

Change-Id: I601a46f7a88250ed004e4ec9c90e06c8460de680
2020-01-13 13:55:31 -08:00
Eric Laurent
2d0682b212 Merge "Audio HAL: Add API to attach an effect to a device" 2020-01-13 21:40:24 +00:00
Eric Laurent
4e018cf039 Merge "Audio effect HAL: Add create effect API with device ID" 2020-01-13 21:39:45 +00:00
Eric Laurent
70a7b39f68 Audio HAL: Add API to attach an effect to a device
Add a function to audio HAL 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.
This function must be supported from legacy HAL version 3.1.

Bug: 136294538
Test: make
Change-Id: Id63c83403fef580579c52d92758a552d67c3faec
Merged-In: Id63c83403fef580579c52d92758a552d67c3faec
2020-01-10 11:17:36 -08:00
Eric Laurent
647165d396 Audio effect HAL: Add create effect API with device ID
Add the possibility to specify a target audio device when
creating an audio effect by passing its audio port handle
to createEffect API.

Add new create_effect_3_1() function to audio_effect_library_t
interface for interface version to 3.1.

Bug: 136294538
Test: make
Change-Id: Ia84eaf32f2a7c0cc73a43075c84902a395bafe58
Merged-In: Ia84eaf32f2a7c0cc73a43075c84902a395bafe58
2020-01-10 11:17:18 -08:00
Automerger Merge Worker
cfb9a10ba2 Merge "Fix camera.v4l2 module build error" am: 2e88e2d003 am: 2e5ebdc287
Change-Id: I4421c0fd30ce9f93cfcb402d34600ae08a9cdd0f
2019-12-14 00:44:26 +00:00
Changyeon Jo
2e5ebdc287 Merge "Fix camera.v4l2 module build error"
am: 2e88e2d003

Change-Id: I188c3ed17c684040daa4b164507eebd9df5c0947
2019-12-13 16:35:27 -08:00
Treehugger Robot
2e88e2d003 Merge "Fix camera.v4l2 module build error" 2019-12-14 00:28:26 +00:00
Automerger Merge Worker
d8e047e20d Merge "Update for increased SW input codes." am: 028d49fd02 am: e8b375fb86
Change-Id: I4e7551f46599951d08985ae21ea2402148a507a3
2019-12-13 22:05:44 +00:00
Christopher Ferris
e8b375fb86 Merge "Update for increased SW input codes."
am: 028d49fd02

Change-Id: Ic8a98516b8e572318e6c6a5add1751d72da32d6d
2019-12-13 13:49:52 -08:00
Christopher Ferris
028d49fd02 Merge "Update for increased SW input codes." 2019-12-13 21:39:54 +00:00
Changyeon Jo
a8998121ab Fix camera.v4l2 module build error
Undeclared uint8 data types are used in exif_utils.cpp file and this
change corrects their types as uint8_t instead.

Bug: 140885470
Test: mm
Change-Id: I2e48a134c24cd3f17a7b6bafdc815200ca546826
Signed-off-by: Changyeon Jo <changyeon@google.com>
2019-12-13 03:20:34 +00:00
Randall Huang
db8dc4a65e Revert submission
Reason for revert: 146032426

Bug: 146032426
Change-Id: I95e2d4ea78de8f318e8da13e9400722087054faa
(cherry picked from commit b1c4e2dd9f)
2019-12-11 11:16:46 +00:00
Automerger Merge Worker
2d43551bb1 Merge "Add ROLLBACK_RESISTANCE definition to for KM4" am: 6ec7a6f455 am: caad59f000
Change-Id: I992c7daebd7c460073c2de00d2e83a7da1ea8db5
2019-12-11 08:29:34 +00:00
Matthew Maurer
caad59f000 Merge "Add ROLLBACK_RESISTANCE definition to for KM4"
am: 6ec7a6f455

Change-Id: I49efe8901a9f3bded329bebe9934164f7e94a2e5
2019-12-11 00:07:29 -08:00
Treehugger Robot
6ec7a6f455 Merge "Add ROLLBACK_RESISTANCE definition to for KM4" 2019-12-11 08:02:41 +00:00
Matthew Maurer
581f6f774e Add ROLLBACK_RESISTANCE definition to for KM4
* Add ROLLBACK_RESISTANCE tag
* Add ROLLBACK_RESISTANCE_UNAVAILABLE error code

Test: m libkeymaster_messages
Change-Id: I355ca86741337f86ae3954bed60b7fc061cae9ce
Merged-In: I355ca86741337f86ae3954bed60b7fc061cae9ce
2019-12-11 07:02:18 +00:00
Christopher Ferris
8f1020639f Update for increased SW input codes.
The new android-mainline kernel has increase the maximum number of
SW input codes to 33, so update the code to handle more than 32
values.

Test: Builds.
Change-Id: I344de37569c1d2c4ff94b8025a7339147ac9afe7
2019-12-10 12:56:15 -08:00
Automerger Merge Worker
95b5c69a90 [automerger skipped] Merge "Fix accidental implicit fallthroughs" into oc-mr1-dev am: f5d56edc27 -s ours am: 57badc4ae2 -s ours am: 5c33d5b916 -s ours am: 49fff87ce0 -s ours am: 0a298ae489 -s ours
am skip reason: Change-Id I818e18a995760f17b85b4c72ee577e531fa2a601 with SHA-1 fbeb4fc139 is in history

Change-Id: I9e7504da63b3361d2034791610cb489be2f6e32c
2019-12-05 04:04:35 +00:00
Automerger Merge Worker
0a298ae489 [automerger skipped] Merge "Fix accidental implicit fallthroughs" into oc-mr1-dev am: f5d56edc27 -s ours am: 57badc4ae2 -s ours am: 5c33d5b916 -s ours am: 49fff87ce0 -s ours
am skip reason: Change-Id I818e18a995760f17b85b4c72ee577e531fa2a601 with SHA-1 fbeb4fc139 is in history

Change-Id: I913fa667e484f943270217c34d50f90fe64ce9a6
2019-12-05 03:51:39 +00:00
Automerger Merge Worker
49fff87ce0 [automerger skipped] Merge "Fix accidental implicit fallthroughs" into oc-mr1-dev am: f5d56edc27 -s ours am: 57badc4ae2 -s ours am: 5c33d5b916 -s ours
am skip reason: Change-Id I818e18a995760f17b85b4c72ee577e531fa2a601 with SHA-1 fbeb4fc139 is in history

Change-Id: Ia9155f11e19ef76f4385f1e0a61a9a11b1f8e26c
2019-12-05 03:34:40 +00:00
Automerger Merge Worker
5c33d5b916 [automerger skipped] Merge "Fix accidental implicit fallthroughs" into oc-mr1-dev am: f5d56edc27 -s ours am: 57badc4ae2 -s ours
am skip reason: Change-Id I818e18a995760f17b85b4c72ee577e531fa2a601 with SHA-1 fbeb4fc139 is in history

Change-Id: I442d2d11aaae85eae52a5ee3bf2b5b677423c9e8
2019-12-05 03:21:43 +00:00
Automerger Merge Worker
57badc4ae2 [automerger skipped] Merge "Fix accidental implicit fallthroughs" into oc-mr1-dev am: f5d56edc27 -s ours
am skip reason: Change-Id I818e18a995760f17b85b4c72ee577e531fa2a601 with SHA-1 fbeb4fc139 is in history

Change-Id: I5497444c80633999820bf0380a50194b74a7ba45
2019-12-05 03:04:42 +00:00
TreeHugger Robot
f5d56edc27 Merge "Fix accidental implicit fallthroughs" into oc-mr1-dev 2019-12-05 02:53:33 +00:00
Automerger Merge Worker
a0563f0ce6 [automerger skipped] Fix accidental implicit fallthroughs am: fbeb4fc139 am: 85eac001da am: 89462bd0e6 -s ours am: 0d411bddad -s ours am: 49e01145d5 -s ours am: 3235fb8377 -s ours am: 6ca65c3cec -s ours
am skip reason: Change-Id I818e18a995760f17b85b4c72ee577e531fa2a601 with SHA-1 540824e658 is in history

Change-Id: I485cfbb90ab800d6c23f11cfe98d958a8f6445f5
2019-12-04 18:22:30 +00:00
Automerger Merge Worker
6ca65c3cec [automerger skipped] Fix accidental implicit fallthroughs am: fbeb4fc139 am: 85eac001da am: 89462bd0e6 -s ours am: 0d411bddad -s ours am: 49e01145d5 -s ours am: 3235fb8377 -s ours
am skip reason: Change-Id I818e18a995760f17b85b4c72ee577e531fa2a601 with SHA-1 540824e658 is in history

Change-Id: I4d37c610262fc6dbcd614eff0436c74becec497e
2019-12-04 18:13:48 +00:00
Automerger Merge Worker
3235fb8377 [automerger skipped] Fix accidental implicit fallthroughs am: fbeb4fc139 am: 85eac001da am: 89462bd0e6 -s ours am: 0d411bddad -s ours am: 49e01145d5 -s ours
am skip reason: Change-Id I818e18a995760f17b85b4c72ee577e531fa2a601 with SHA-1 540824e658 is in history

Change-Id: Ifd522d853cc0fd2e27e01da09f381ec1aad0983e
2019-12-04 18:00:03 +00:00
Automerger Merge Worker
49e01145d5 [automerger skipped] Fix accidental implicit fallthroughs am: fbeb4fc139 am: 85eac001da am: 89462bd0e6 -s ours am: 0d411bddad -s ours
am skip reason: Change-Id I818e18a995760f17b85b4c72ee577e531fa2a601 with SHA-1 540824e658 is in history

Change-Id: I9153936b4ebc3714bce40e3ecc828d28a186068a
2019-12-04 17:48:17 +00:00
Automerger Merge Worker
0d411bddad [automerger skipped] Fix accidental implicit fallthroughs am: fbeb4fc139 am: 85eac001da am: 89462bd0e6 -s ours
am skip reason: Change-Id I818e18a995760f17b85b4c72ee577e531fa2a601 with SHA-1 e43fe9ddf2 is in history

Change-Id: If4f49b15f9e70c4288e7f5b153938a2d0ee25876
2019-12-04 17:36:13 +00:00
Automerger Merge Worker
89462bd0e6 Fix accidental implicit fallthroughs am: fbeb4fc139 am: 85eac001da
Change-Id: I74f180f5154637eef3261e43a4b4691a435ae715
2019-12-04 17:27:52 +00:00
Automerger Merge Worker
33656e8bd5 [automerger skipped] Merge "Fix accidental implicit fallthroughs" into qt-dev am: 2c4ce12ed7 -s ours am: 0d6a27f566 -s ours am: 868474f0c1 -s ours
am skip reason: Change-Id I818e18a995760f17b85b4c72ee577e531fa2a601 with SHA-1 e43fe9ddf2 is in history

Change-Id: Iabcf0b9b6d59b253ee43a88a75c24ca593f6f91d
2019-12-04 17:23:32 +00:00
Automerger Merge Worker
85eac001da Fix accidental implicit fallthroughs am: fbeb4fc139
Change-Id: I3cb7f4a81839065f4d91f334833b1347e6f05d11
2019-12-04 17:18:58 +00:00
Automerger Merge Worker
868474f0c1 [automerger skipped] Merge "Fix accidental implicit fallthroughs" into qt-dev am: 2c4ce12ed7 -s ours am: 0d6a27f566 -s ours
am skip reason: Change-Id I818e18a995760f17b85b4c72ee577e531fa2a601 with SHA-1 e43fe9ddf2 is in history

Change-Id: Ic88603d71e775c4f1683045db2bc76ed8e801e6a
2019-12-04 17:12:39 +00:00
Automerger Merge Worker
0d6a27f566 [automerger skipped] Merge "Fix accidental implicit fallthroughs" into qt-dev am: 2c4ce12ed7 -s ours
am skip reason: Change-Id I818e18a995760f17b85b4c72ee577e531fa2a601 with SHA-1 e43fe9ddf2 is in history

Change-Id: I13d391006c1449b56e62902cf44d87902947cd8e
2019-12-04 16:59:57 +00:00
TreeHugger Robot
2c4ce12ed7 Merge "Fix accidental implicit fallthroughs" into qt-dev 2019-12-04 16:51:41 +00:00
Automerger Merge Worker
860ee5a0cf [automerger skipped] Fix accidental implicit fallthroughs am: e43fe9ddf2 am: 876dd34376 am: 8dbb6dee8f -s ours am: c7e702e3f9 -s ours
am skip reason: Change-Id I818e18a995760f17b85b4c72ee577e531fa2a601 with SHA-1 bfcf9140fe is in history

Change-Id: I41cb2052d465610566ea5622a836a64cbb27d0c8
2019-12-04 16:38:02 +00:00
Automerger Merge Worker
c7e702e3f9 [automerger skipped] Fix accidental implicit fallthroughs am: e43fe9ddf2 am: 876dd34376 am: 8dbb6dee8f -s ours
am skip reason: Change-Id I818e18a995760f17b85b4c72ee577e531fa2a601 with SHA-1 bfcf9140fe is in history

Change-Id: I61aef7ac0f2b0a5a02718658e913ec19d6dd4add
2019-12-04 16:29:20 +00:00
Automerger Merge Worker
8dbb6dee8f Fix accidental implicit fallthroughs am: e43fe9ddf2 am: 876dd34376
Change-Id: I38046073df4d71624597a997367fb82fc5cecbf0
2019-12-04 16:19:54 +00:00
Automerger Merge Worker
876dd34376 Fix accidental implicit fallthroughs am: e43fe9ddf2
Change-Id: I9bf99133ea0cf8b5cd4c4e4010d5a8e5a29b2547
2019-12-04 16:13:49 +00:00
Automerger Merge Worker
55ff29a3de [automerger skipped] Fix accidental implicit fallthroughs am: bfcf9140fe -s ours
am skip reason: Change-Id I818e18a995760f17b85b4c72ee577e531fa2a601 with SHA-1 377856d1be is in history

Change-Id: I99bb06eb9da339f1a6f7c7c39603884f14bfdff2
2019-12-04 15:00:43 +00:00
Colin Cross
bfcf9140fe Fix accidental implicit fallthroughs
-Wimplicit-fallthrough was printing warnings for these, they look
like real errors.  Fix them and re-enable the error.

Bug: 144040966
Test: treehugger
Merged-In: I818e18a995760f17b85b4c72ee577e531fa2a601
Change-Id: I818e18a995760f17b85b4c72ee577e531fa2a601
2019-11-26 15:56:38 +00:00
Colin Cross
540824e658 Fix accidental implicit fallthroughs
-Wimplicit-fallthrough was printing warnings for these, they look
like real errors.  Fix them and re-enable the error.

Bug: 144040966
Test: treehugger
Merged-In: I818e18a995760f17b85b4c72ee577e531fa2a601
Change-Id: I818e18a995760f17b85b4c72ee577e531fa2a601
2019-11-26 15:56:26 +00:00
Colin Cross
e43fe9ddf2 Fix accidental implicit fallthroughs
-Wimplicit-fallthrough was printing warnings for these, they look
like real errors.  Fix them and re-enable the error.

Bug: 144040966
Test: treehugger
Merged-In: I818e18a995760f17b85b4c72ee577e531fa2a601
Change-Id: I818e18a995760f17b85b4c72ee577e531fa2a601
2019-11-26 15:55:47 +00:00
Colin Cross
e38c5a976c Fix accidental implicit fallthroughs
-Wimplicit-fallthrough was printing warnings for these, they look
like real errors.  Fix them and re-enable the error.

Bug: 144040966
Test: treehugger
Merged-In: I818e18a995760f17b85b4c72ee577e531fa2a601
Change-Id: I818e18a995760f17b85b4c72ee577e531fa2a601
2019-11-26 15:52:13 +00:00
Colin Cross
fbeb4fc139 Fix accidental implicit fallthroughs
-Wimplicit-fallthrough was printing warnings for these, they look
like real errors.  Fix them and re-enable the error.

Bug: 144040966
Test: treehugger
Merged-In: I818e18a995760f17b85b4c72ee577e531fa2a601
Change-Id: I818e18a995760f17b85b4c72ee577e531fa2a601
2019-11-26 10:47:57 -05:00