bd5609f0a3
DO NOT MERGE: Merge commit '89f1f99d646fc6fbe72edc0d3f48d628543dd841' into manual_merge_89f1f99d64
...
Merged-In: Iabcb5469c4fd936c2d7c1f9a1113c557c8beab88
Change-Id: Iac8c115a9e2195cd2df1ba507985e5f663587502
7 years ago
1b7dfe7de8
Add libhardware_headers to various modules
...
Bug: 33241851
Test: build target and pass CTS
Test: With BOARD_VNDK_VERSION, mma works
Merged-In: Iabcb5469c4fd936c2d7c1f9a1113c557c8beab88
Change-Id: Iabcb5469c4fd936c2d7c1f9a1113c557c8beab88
(cherry picked from commit da6a063a9e
7 years ago
cfa2839302
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev am: ef3a4aead0 am: 0ef6d9c121 am: 966e572c69 am: 1f7d80772c am: a7e658fcca am: 6d2092f734 am: 6447404db3 am: 8693c57563 am: 25e3a40344 am: 51789f19de am: 7ba7584303 am: 5304cbcee8 am: 798dba38c4 am: fdd5f801f5 am: cdc2e0a0d8
...
am: 3a8678f545
7 years ago
3a8678f545
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev am: ef3a4aead0 am: 0ef6d9c121 am: 966e572c69 am: 1f7d80772c am: a7e658fcca am: 6d2092f734 am: 6447404db3 am: 8693c57563 am: 25e3a40344 am: 51789f19de am: 7ba7584303 am: 5304cbcee8 am: 798dba38c4 am: fdd5f801f5
...
am: cdc2e0a0d8
7 years ago
7ba7584303
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev am: ef3a4aead0 am: 0ef6d9c121 am: 966e572c69 am: 1f7d80772c am: a7e658fcca am: 6d2092f734 am: 6447404db3 am: 8693c57563 am: 25e3a40344
...
am: 51789f19de
7 years ago
6447404db3
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev am: ef3a4aead0 am: 0ef6d9c121 am: 966e572c69 am: 1f7d80772c am: a7e658fcca
...
am: 6d2092f734
7 years ago
a7e658fcca
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev am: ef3a4aead0 am: 0ef6d9c121 am: 966e572c69
...
am: 1f7d80772c
7 years ago
1f7d80772c
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev am: ef3a4aead0 am: 0ef6d9c121
...
am: 966e572c69
7 years ago
966e572c69
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev am: ef3a4aead0
...
am: 0ef6d9c121
7 years ago
ef3a4aead0
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev
7 years ago
68b9e0f5d6
Fix security vulnerability: Equalizer setParameter memory overflow
...
Bug: 37563371
Test: use POC on bug or cts security test
Change-Id: I9c9453a222b53fd5ef821330a34cb9e938e4d9c5
7 years ago
5f9e26e8f6
Merge "EffectBundle: Check value size for get preset name" into klp-dev am: f5d6e98996 am: b401a3bf44 am: 1f44782e92 am: ea83248dfb am: 716d258db4 am: f043bb5da6 am: 4d76e5bcd6 am: f21d5b4580 am: f0221a7dbe am: b26594e6ae am: 158ec15776 am: 426244d6dc am: c47adacb0d am: 0d340d4990 am: 0d77973e73
...
am: c86bf87c17
7 years ago
c86bf87c17
Merge "EffectBundle: Check value size for get preset name" into klp-dev am: f5d6e98996 am: b401a3bf44 am: 1f44782e92 am: ea83248dfb am: 716d258db4 am: f043bb5da6 am: 4d76e5bcd6 am: f21d5b4580 am: f0221a7dbe am: b26594e6ae am: 158ec15776 am: 426244d6dc am: c47adacb0d am: 0d340d4990
...
am: 0d77973e73
7 years ago
158ec15776
Merge "EffectBundle: Check value size for get preset name" into klp-dev am: f5d6e98996 am: b401a3bf44 am: 1f44782e92 am: ea83248dfb am: 716d258db4 am: f043bb5da6 am: 4d76e5bcd6 am: f21d5b4580 am: f0221a7dbe
...
am: b26594e6ae
7 years ago
4d76e5bcd6
Merge "EffectBundle: Check value size for get preset name" into klp-dev am: f5d6e98996 am: b401a3bf44 am: 1f44782e92 am: ea83248dfb am: 716d258db4
...
am: f043bb5da6
7 years ago
716d258db4
Merge "EffectBundle: Check value size for get preset name" into klp-dev am: f5d6e98996 am: b401a3bf44 am: 1f44782e92
...
am: ea83248dfb
7 years ago
ea83248dfb
Merge "EffectBundle: Check value size for get preset name" into klp-dev am: f5d6e98996 am: b401a3bf44
...
am: 1f44782e92
7 years ago
1f44782e92
Merge "EffectBundle: Check value size for get preset name" into klp-dev am: f5d6e98996
...
am: b401a3bf44
7 years ago
67618464ba
Merge "Effects: Update audio_effects.conf to use vendor" into oc-dev
...
am: 4f627e60fa
7 years ago
4f627e60fa
Merge "Effects: Update audio_effects.conf to use vendor" into oc-dev
7 years ago
5b750b08e9
libeffects: move all libraries to vendor
...
Bug: 37490685
Test: equalizer works in google play music
Test: CleanSpec works
Change-Id: I9c1d19b5b5c5099edc9c20ff7728adc830ff4786
(cherry picked from commit f7df59c9e1
7 years ago
16ce86c78e
Effects: Update audio_effects.conf to use vendor
...
Matches build targets.
Test: Fugu dumpsys, CTS
Bug: 38505859
Change-Id: I812dc8414ab286b906ee02c47296d365aeb33a4d
7 years ago
0c46529868
Merge "libeffects: move all libraries to vendor" am: 0b9bb5e2d1 am: f036194218
...
am: 86e5abfd24
7 years ago
0b9bb5e2d1
Merge "libeffects: move all libraries to vendor"
7 years ago
28588e78a2
relax effects library path in audio_effects.conf
...
am: 0556a2363f
7 years ago
0556a2363f
relax effects library path in audio_effects.conf
...
Consider only the file name part of the library path specified in
audio_effects.conf and only if the path contains "/lib/soundfx" then
try all standard paths in the folowing order: /odm/.. /vendor/.. and /system/..
Bug: 38000861
Bug: 38505859
Test: check effect libraries are loaded from /system/lib or /vendor/lib
Change-Id: Ib02ecb3a464a59e7b7babcd9405b8fe4dc074745
(cherry picked from commit 7a13c2d0b0
7 years ago
f7df59c9e1
libeffects: move all libraries to vendor
...
Bug: 37490685
Test: equalizer works in google play music
Test: CleanSpec works
Change-Id: I9c1d19b5b5c5099edc9c20ff7728adc830ff4786
7 years ago
fa5c6c97ee
EffectBundle: Check value size for get preset name
...
Test: CTS testAllEffectsEqualizer_CVE_2017_0401
Bug: 37536407
Change-Id: I347af04677fc49a01efb549f06ff81d1a00dc4d0
7 years ago
1e9024c06a
Merge "Replace LOCAL_C_INCLUDES with header lib dependency." am: 2cb9b1b621 am: 8ff5ee3a2d
...
am: 917a18f235
7 years ago
1fee1a82e0
Replace LOCAL_C_INCLUDES with header lib dependency.
...
Test: works with BOARD_VNDK_VERSION=current
Bug: 33241851
Change-Id: I8d3c47fe3d4b7dfe69d04e1f9ea1263cde067174
7 years ago
be02841e82
resolve merge conflicts of 88874349da to oc-dev-plus-aosp
...
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I62de4ad3072884e3a66e64bab417ea849b78fd10
7 years ago
5e5aa0e3fe
libeffects: move all libraries to vendor
...
Bug: 37490685
Test: equalizer works in google play music
Test: CleanSpec works
Merged-In: I323f4048bce8a512d8aaa1760aef9d176a282c2d
Change-Id: I323f4048bce8a512d8aaa1760aef9d176a282c2d
(cherry picked from commit df57a30938
7 years ago
c21a24aa88
libeffects: move all libraries to vendor
...
Bug: 37490685
Test: equalizer works in google play music
Test: CleanSpec works
Change-Id: I323f4048bce8a512d8aaa1760aef9d176a282c2d
7 years ago
a3b4ef8b5f
Add libeffects_headers.
...
Also had to fix the location and symlink of them.
Test: works with BOARD_VNDK_VERSION := current
Bug: 33241851
Change-Id: Idcfe1eaaf7be10a183b69bafa07f035ab9ca1e4e
7 years ago
c2e0f33032
libeffects: move to vendor
...
Bug: 33241851
Test: equalizer works in google play music
Test: CleanSpec works
Change-Id: I11b54a5f050f914afc234e15f680581d15064c82
7 years ago
090eb09be1
Show in dumpsys effect libraries that failed to load
...
Bug: 36525163
Bug: 36864417
Change-Id: I120129cb43e9593cc94ba361fe76ade86448e46a
Test: run and use dumpsys audio_flinger
7 years ago
5bfa94c5a4
libeffects: Fix EQ's 5th band upper limit
...
The old value: "1" is invalid, as follows from the code that
uses these values.
Bug: 36651594
Change-Id: I0516272241ffc1c4d346d8d66b06169b981bae2c
Test: VTS test for Audio Effects
(cherry picked from commit 3cf264448d
7 years ago
904d632a24
Add support for USB headset device
...
Add missing rules for USB headset devices in routing, volume and effects
management.
Test: playback and catpure regression tests.
Change-Id: I42cd157f483deba2371a05d332cd11dceb2b2fa3
7 years ago
e2b43843fd
Moved headers from include/ to appropriate libs
...
include/camera -> camera/include/camera
include/media/audiohal -> media/libaudiohal/include
include/media/AudioResampler*.h -> media/libaudioprocessing/include
include/media/Audio*.h,IAudio*.h,IEffect*.h,ToneGenerator.h -> media/libaudioclient/include
include/media/EffectsFactoryApi.h -> media/libeffects/include
include/media/stagefright -> media/libstagefright/include
include/media/nbaio -> media/libnbaio/include
include/media/<rest of files> -> media/libmedia/include
include/cpustats -> media/libcpustats/include/cpustats
Added symlinks from old location to new ones
Bug: 33241851
Test: VNDK linked modules will need to add explicit lib dep.
All other modules should compile the same
Change-Id: I0ecf754a2132640ae781a3cc31428fb8c0bd1669
7 years ago
683094933e
EffectBundle: check nb channels to write speaker angles am: e5a54485e0 am: b0896dfc81 am: b9e070af6a am: e5c0e7e10b am: 3ffe48ed29 am: 3db88c0f00 am: 9169ca1b88 am: 654e9f9282 am: 8e86da478b am: 7ea7597648 am: 5c9fcda34e am: 8987fbb09b
...
am: dbedfa05fe
8 years ago
8987fbb09b
EffectBundle: check nb channels to write speaker angles am: e5a54485e0 am: b0896dfc81 am: b9e070af6a am: e5c0e7e10b am: 3ffe48ed29 am: 3db88c0f00 am: 9169ca1b88 am: 654e9f9282 am: 8e86da478b am: 7ea7597648
...
am: 5c9fcda34e
8 years ago
654e9f9282
EffectBundle: check nb channels to write speaker angles am: e5a54485e0 am: b0896dfc81 am: b9e070af6a am: e5c0e7e10b am: 3ffe48ed29 am: 3db88c0f00
...
am: 9169ca1b88
8 years ago
e5c0e7e10b
EffectBundle: check nb channels to write speaker angles am: e5a54485e0 am: b0896dfc81
...
am: b9e070af6a
8 years ago
b0896dfc81
EffectBundle: check nb channels to write speaker angles
...
am: e5a54485e0
8 years ago
e5a54485e0
EffectBundle: check nb channels to write speaker angles
...
When speaker angles are queried, the size of the array for the
returned data is 3x the number of channels (where really it
should be max(2, nbChannels)). The code assumed it was at
least 3x2 (where 2 is the number of virtual speakers this
effect supports) and would thus crash when called for a mono
channel mask.
Test: see repro steps in bug
Bug: 32591350
Change-Id: I33d4bff6b2e19a9fc4284a85a446804878d3a410
8 years ago
060a6c53b5
Merge "liblog: use log/log.h for ALOG macros" am: 59cfe7de39 am: c6d07e8230 am: 15b18326b6
...
am: 49d3b5ee8e
8 years ago
15b18326b6
Merge "liblog: use log/log.h for ALOG macros" am: 59cfe7de39
...
am: c6d07e8230
8 years ago
e74bbf18a6
liblog: use log/log.h for ALOG macros
...
Test: compile
Bug: 34250038
Change-Id: Ie3b92790df631dbacdd51053264dddeba66913c1
8 years ago
ad880540d1
Merge "liblog: use log/log.h for ALOG macros" am: 06d8feefec am: 71bf335ffa am: 8790fb2613
...
am: 9033512273
8 years ago
8790fb2613
Merge "liblog: use log/log.h for ALOG macros" am: 06d8feefec
...
am: 71bf335ffa
8 years ago
Jiyong Park
Vijay Venkatraman
Ricardo Garcia
Andy Hung
SzuWei Lin
Treehugger Robot
Eric Laurent
Steven Moreland
Mikhail Naganov
Jean-Michel Trivi
Mark Salyzyn