Commit graph

5248 commits

Author SHA1 Message Date
Automerger Merge Worker
9dfee6c767 [automerger skipped] Merge "DO NOT MERGE - Merge QQ1A.200205.002 into master" am: a8c23bc91e am: a2e1109653 am: cb4adc54e3 -s ours
am skip reason: subject contains skip directive

Change-Id: I5c09110520d7acdd672daf115927f508b43515dc
2020-02-08 02:24:41 +00:00
Automerger Merge Worker
f77f808f5b [automerger skipped] DO NOT MERGE - Merge QQ1A.200205.002 into master am: ea78baf341 am: 594d100464 am: f2bdf90368 -s ours
am skip reason: subject contains skip directive

Change-Id: I1710be98e1e7aacf753bf9ce1a0c4a7891e32ce6
2020-02-08 02:22:10 +00:00
Automerger Merge Worker
cb4adc54e3 Merge "DO NOT MERGE - Merge QQ1A.200205.002 into master" am: a8c23bc91e am: a2e1109653
Change-Id: Ief2e8fd835612e700ddcc34a20069f52f4a788ab
2020-02-08 01:56:59 +00:00
Automerger Merge Worker
f2bdf90368 DO NOT MERGE - Merge QQ1A.200205.002 into master am: ea78baf341 am: 594d100464
Change-Id: I889ba9d170bd49daac8e018eeeb64c55eaff6b34
2020-02-08 01:55:27 +00:00
Automerger Merge Worker
a2e1109653 Merge "DO NOT MERGE - Merge QQ1A.200205.002 into master" am: a8c23bc91e
Change-Id: I09a06d569ae7983a92fdeae12dd784d1f399dd60
2020-02-08 01:50:13 +00:00
Automerger Merge Worker
594d100464 DO NOT MERGE - Merge QQ1A.200205.002 into master am: ea78baf341
Change-Id: I9349e2af0fd243a97e4b3683706870f018cf693e
2020-02-08 01:38:43 +00:00
Treehugger Robot
a8c23bc91e Merge "DO NOT MERGE - Merge QQ1A.200205.002 into master" 2020-02-08 01:29:23 +00:00
Automerger Merge Worker
c2db733781 Add ROLLBACK_RESISTANCE definition to for KM4 am: 6f48a11a79
Change-Id: I87d256349f8b1b02dae4594bdfaf2d04c876bf52
2020-02-07 21:30:55 +00:00
Matthew Maurer
6f48a11a79 Add ROLLBACK_RESISTANCE definition to for KM4
* Add ROLLBACK_RESISTANCE tag
* Add ROLLBACK_RESISTANCE_UNAVAILABLE error code

Test: m libkeymaster_messages
Change-Id: Ib69a0c0f179f894b488da8608e6005e68450453a
(cherry picked from commit df2f2301a3)
2020-02-07 16:01:55 +00:00
Xin Li
ea78baf341 DO NOT MERGE - Merge QQ1A.200205.002 into master
Bug: 147428392
Change-Id: I92ed91736a7fdb8f03a720d945f859cc49b430ac
2020-02-05 10:45:12 -08:00
TreeHugger Robot
fadd886ad2 Merge "Update new values for latest sensor HAL changes" 2020-01-24 18:45:02 +00:00
Dan Stoza
d5f2f67cd2 [hwc2] Add generic layer metadata (Composer 2.4)
Bug: 139747351
Test: VtsHalGraphicsComposerV2_4TargetTest
Test: Manual verification with a modified Composer implementation
Change-Id: Id3ac89612f41ef1d4d03552cc7b0851f6aba1f77
2020-01-22 15:18:30 -08:00
Matthew Maurer
df2f2301a3 Add ROLLBACK_RESISTANCE definition to for KM4
* Add ROLLBACK_RESISTANCE tag
* Add ROLLBACK_RESISTANCE_UNAVAILABLE error code

Test: m libkeymaster_messages
Change-Id: Ib69a0c0f179f894b488da8608e6005e68450453a
2020-01-20 21:11:01 -07:00
Peiyong Lin
7190983117 Merge "Add getClientTargetProperty API entry." 2020-01-18 01:08:19 +00:00
Anthony Stange
e2a118aafb Update new values for latest sensor HAL changes
A hinge angle sensor type has been added to the sensor HAL which
requires updating sensor.h and sensor-base.h.

Bug: 144139857
Test: N/A
Change-Id: I0d8e7d028cc1b2e05a8ec74b7ab3da9ffff5dbde
2020-01-16 19:39:06 -05:00
Automerger Merge Worker
186f4476e1 [automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: ead3ab68fe am: 5687a73d9c -s ours
am skip reason: subject contains skip directive

Change-Id: I00a0b32284a9f2e44f83c8974605fc5b4231611c
2020-01-16 19:01:02 +00:00
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
Peiyong Lin
f777542fd8 Add getClientTargetProperty API entry.
getClientTargetProperty will give hardware composer the ability to request some
properties of the client target that hardware composer wants. Prior to this
API, the client will does its best to produce the client target of which the
properties are pretty much fixed.

BUG: b/145968912
Test: boot
Change-Id: Ib8ba44d274a0c8a86c3fde1d09b72f592445ee91
2020-01-14 14:38:19 -08:00
Automerger Merge Worker
e0cc5207b2 [automerger skipped] Merge "Audio HAL: Add API to attach an effect to a device" am: 2d0682b212 am: e16c3ebe00 am: 6e32a78e12 -s ours
am skip reason: Change-Id Id63c83403fef580579c52d92758a552d67c3faec with SHA-1 26f0adfef1 is in history

Change-Id: I792b6427f72dc0f73a35bd7aff1702af7ddbed0f
2020-01-13 22:22:39 +00:00
Automerger Merge Worker
ba9c11a9fb [automerger skipped] Merge "Audio effect HAL: Add create effect API with device ID" am: 4e018cf039 am: 51c5e608ff am: d252c69d3b -s ours
am skip reason: Change-Id Ia84eaf32f2a7c0cc73a43075c84902a395bafe58 with SHA-1 472c7ed05f is in history

Change-Id: I4435de686f728e1cad5662ba8c3c125c11cee69b
2020-01-13 22:22:10 +00: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
Nicholas Ambur
430cc25a7c Merge "add start_recognition_exteded soundtrigger api" 2020-01-11 16:39:55 +00:00
Ady Abraham
fbdca5fdaa Merge "hwcomposer2: add seamlessPossible callback" 2020-01-11 00:29:58 +00:00
Nicholas Ambur
dc10826841 add start_recognition_exteded soundtrigger api
Bug: 146363190
Test: atest VtsHalSoundtriggerV2_3TargetTest
&& Assist GTS test suite and manual testing

Change-Id: I6a1ac196cb7f5ad1c0b60f0adfb67680bb18568b
2020-01-10 14:01:10 -08:00
Peiyong Lin
ae5e8ab33e Merge "[composer] Make Auto low latency mode APIs optional." 2020-01-10 19:24:50 +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
Peiyong Lin
b923ad03cf [composer] Make Auto low latency mode APIs optional.
BUG: b/147365206
Test: boot
Change-Id: I54e21cbbf3b69813d8c58bd33b0c1d1e5f7a8fd8
2020-01-10 09:40:00 -08:00
Ady Abraham
c1b2f0753e hwcomposer2: add seamlessPossible callback
Add a callback to notify the client it should retry a
setActiveConfigWithConstraints call in case of SEAMLESS_NOT_POSSIBLE error.

Test: rev up composer to 2.4
Bug: 141329414
Change-Id: I102bedc9cb89f9d1886a431f8804897bb838eb8f
2020-01-07 22:35:57 +00:00
Nicholas Ambur
581c67326f add get_properties_extended soundtrigger api
Bug: 142414689
Test: GTS assist test suite and manual testing
Change-Id: I86c78e46bfee5072619d38784c29cd871ede731c
2020-01-07 14:03:20 -08:00
android-build-team Robot
a27a0cbfc0 Merge cherrypicks of [9943992, 9944684, 9944054, 9943993, 9944476, 9942363, 9942364, 9942365, 9942367, 9944685, 9944686, 9943217, 9944762, 9944764, 9944481, 9944411, 9944055, 9944056, 9944057] into qt-qpr1-release
Change-Id: Ia7e107eaf259f3d4373ac364b4a6f3d9ad130363
2019-12-18 06:24:48 +00:00
Colin Cross
2526448930 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
(cherry picked from commit bfcf9140fe)
2019-12-18 06:23:47 +00:00
Galia Peycheva
038dfb1b1c Add ALLM and Content types in hwc2
Bug:132731049

Test: make -j$(nproc)
Change-Id: I652244d1934bef1472b7980ff7f4736b0460c53f
2019-12-17 13:51:11 +01:00
Robin Lee
61a7219b63 Merge "Revert submission" 2019-12-14 03:06:25 +00:00
Automerger Merge Worker
e5f6709ff0 Merge "Fix camera.v4l2 module build error" am: 2e88e2d003 am: 2e5ebdc287 am: cfb9a10ba2
Change-Id: If6351c622598606031c9f40e9d1690be3cb2749f
2019-12-14 00:58:25 +00: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
Eric Laurent
1497080a9b Merge "Audio HAL: Add API to attach an effect to a device" 2019-12-14 00:31:43 +00:00
Treehugger Robot
2e88e2d003 Merge "Fix camera.v4l2 module build error" 2019-12-14 00:28:26 +00:00
Automerger Merge Worker
3e00f5dcbf Merge "Update for increased SW input codes." am: 028d49fd02 am: e8b375fb86 am: d8e047e20d
Change-Id: Ief54d9216855c32cf61b95a35a4ea1961879b95a
2019-12-13 22:19:07 +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
Hansong Zhang
d211ba6bab Revert submission
Based on Forrest run with earlier base build 6069142, the build with this submission failed apct/bluetooth/instrumentation_test 

Reason for revert: Break tests

Change-Id: Icccbdafc14394349baf6d116d6590552ebcbeba9
2019-12-13 22:03:07 +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