Commit graph

5481 commits

Author SHA1 Message Date
Matthew Maurer
2fcfc8278f Add ROLLBACK_RESISTANCE definition to for KM4
* Add ROLLBACK_RESISTANCE tag
* Add ROLLBACK_RESISTANCE_UNAVAILABLE error code

Test: m libkeymaster_messages
Change-Id: I355ca86741337f86ae3954bed60b7fc061cae9ce
2019-12-10 21:42:43 -07: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
Eric Laurent
472c7ed05f 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
2019-12-06 17:23:18 -08:00
Colin Cross
c720784bfe [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: 95b5c69a90 -s ours
am skip reason: change_id I818e18a995760f17b85b4c72ee577e531fa2a601 with SHA1 e43fe9ddf2 is in history

Change-Id: I1de278de887da4179015a6e5eb2f71c1d6f90a22
2019-12-04 20:09:22 -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
d60845d1bb [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: a0563f0ce6 -s ours
am skip reason: Change-Id I818e18a995760f17b85b4c72ee577e531fa2a601 with SHA-1 540824e658 is in history

Change-Id: Ifaa4896d7d58e38ba470ffdf0ef56417386a463f
2019-12-04 18:35:20 +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
5500a0fa45 [automerger skipped] Merge "Fix accidental implicit fallthroughs" into qt-dev am: 2c4ce12ed7 -s ours am: 0d6a27f566 -s ours am: 868474f0c1 -s ours am: 33656e8bd5 -s ours
am skip reason: Change-Id I818e18a995760f17b85b4c72ee577e531fa2a601 with SHA-1 e43fe9ddf2 is in history

Change-Id: Ic72528927fa4f3c5fae94ae10cdf3a01cae89cba
2019-12-04 17:35: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
2e70e25f9d [automerger skipped] Fix accidental implicit fallthroughs am: e43fe9ddf2 am: 876dd34376 am: 8dbb6dee8f -s ours am: c7e702e3f9 -s ours am: 860ee5a0cf -s ours
am skip reason: Change-Id I818e18a995760f17b85b4c72ee577e531fa2a601 with SHA-1 bfcf9140fe is in history

Change-Id: Iefca80ce417a6a0974d5182323c3866099ab860b
2019-12-04 17:15:36 +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
16c5c71fd3 [automerger skipped] Fix accidental implicit fallthroughs am: bfcf9140fe -s ours am: 55ff29a3de -s ours
am skip reason: Change-Id I818e18a995760f17b85b4c72ee577e531fa2a601 with SHA-1 377856d1be is in history

Change-Id: I08c4ca369f6b0c51aab27ac7145e75aed954caef
2019-12-04 15:10:03 +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
Galia Peycheva
f77ae43612 Add ALLM and Content types in hwc2
Bug:132731049

Test: make -j$(nproc)

Change-Id: I563f7d85f3bf92fc5a0710e45f06828cb1daa8b5
2019-12-02 20:58:48 +01: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
Ady Abraham
b1ea403d92 hwcomposer2: few changes for refresh rate switching
- getSupportedDisplayVsyncPeriods was removed as the vsync period
   can be obtained by getDisplayAttribute for each individual config.
 - renamed setActiveConfigAndVsyncPeriod -> setActiveConfigWithConstraints
   to better describe what this function does.
 - added VsyncPeriodChangeTimeline and onVsyncPeriodTimingChanged

Test: rev up composer to 2.4 and test refresh rate switching
Bug: 141329414
Change-Id: Ifec51c893bb9038e9ac48d02c1c7b0fe9e25c108
2019-11-19 23:53:53 +00:00
Mikhail Naganov
487a8c3873 [automerger skipped] Merge "r_submix: Fix get_next_write_timestamp and get_input_buffer_size" am: 3fe18ca38f am: fda30476da
am: a27f141e33 -s ours
am skip reason: change_id I322bf8cf42415fddb028c9cd10db0ac82089ce85 with SHA1 739ce6bbad is in history

Change-Id: I7e7d1c55802db9ecba2827939b53e96d9f83051b
2019-11-11 18:37:36 -08:00
Mikhail Naganov
a27f141e33 Merge "r_submix: Fix get_next_write_timestamp and get_input_buffer_size" am: 3fe18ca38f
am: fda30476da

Change-Id: I73309c0cf35410213a1678ec0d487f768a81f731
2019-11-11 18:33:34 -08:00
Mikhail Naganov
fda30476da Merge "r_submix: Fix get_next_write_timestamp and get_input_buffer_size"
am: 3fe18ca38f

Change-Id: Ib7e151867daf46959a0996145f293143921bbb8f
2019-11-11 18:29:09 -08:00
Treehugger Robot
3fe18ca38f Merge "r_submix: Fix get_next_write_timestamp and get_input_buffer_size" 2019-11-12 02:20:38 +00:00
Nick Desaulniers
130c712501 Merge "libhardware: fix -Wreorder-init-list" am: b833bfbd5f am: 93aa2fa353
am: 8dc561977f

Change-Id: I98ccee55403bd66f8aec783c7a9f91316a31fc19
2019-11-11 18:13:11 -08:00
Nick Desaulniers
8dc561977f Merge "libhardware: fix -Wreorder-init-list" am: b833bfbd5f
am: 93aa2fa353

Change-Id: I01a4ee7ce7fcdbe98730280e9263a5a55926c60c
2019-11-11 18:09:13 -08:00
Nick Desaulniers
93aa2fa353 Merge "libhardware: fix -Wreorder-init-list"
am: b833bfbd5f

Change-Id: I6cfaf4a0d191295386f70d508210178b6b5f16a5
2019-11-11 18:05:13 -08:00
Treehugger Robot
b833bfbd5f Merge "libhardware: fix -Wreorder-init-list" 2019-11-12 01:48:58 +00:00
Nick Desaulniers
79149a378b libhardware: fix -Wreorder-init-list
C++20 is stricter about member ordering in designated initializers than
C99.

Bug: 139945549
Test: mm
Change-Id: I045da46821280e720286a25a0c96b5750d1ad05e
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
2019-11-11 14:41:57 -08:00
Inseob Kim
73dad9ba12 Merge "Use shared version of vndk libmedia_helper" am: deb0edbe3a am: 1f95cfe12e
am: 738edce4ac

Change-Id: Ic2a698b04ce0ca812edf8397bd835dd235a62eb9
2019-11-10 22:37:54 -08:00
Inseob Kim
738edce4ac Merge "Use shared version of vndk libmedia_helper" am: deb0edbe3a
am: 1f95cfe12e

Change-Id: Ice016e975e617026295688eee78f19bb00068907
2019-11-10 22:33:20 -08:00
Inseob Kim
1f95cfe12e Merge "Use shared version of vndk libmedia_helper"
am: deb0edbe3a

Change-Id: I7c842647470af71c25232254df23d2165f257957
2019-11-10 22:29:54 -08:00
Treehugger Robot
deb0edbe3a Merge "Use shared version of vndk libmedia_helper" 2019-11-11 06:15:20 +00:00