OSDN Git Service
Wei Jia [Mon, 1 Apr 2019 23:18:53 +0000 (16:18 -0700)]
NuPlayerCCDecoder: fix memory OOB
Test: cts
Bug:
129068792
Change-Id: Id78ddc983f245feda3a81da3448196340b57f5c9
(cherry picked from commit
e1c7348e1c3fed25c16ae4673101f48b1ed95b7e)
(cherry picked from commit
0f7ff70737d58abda69fa6d4524b1943d6c41461)
Weiyin Jiang [Thu, 26 Apr 2018 16:39:29 +0000 (00:39 +0800)]
audio: ensure effect chain with specific session id is unique
It's possible that tracks with the same session id running on various
playback outputs, which causes effect chain being created on the same
session twice. As a result, the same effect engine will be released
twice as the same context is reused.
Output that has effect chain with same session id is more preferable.
Test: No regression with Play Music and Effects
Bug:
123082420
Bug:
123237974
Merged-In: I690ea3cb942d1fdc96b46048e271557d48000f43
Change-Id: I690ea3cb942d1fdc96b46048e271557d48000f43
(cherry picked from commit
9aeb1770d49bab13ea5c6454c969a713641fe686)
(cherry picked from commit
5945746bcabff8d833229a6c230cbe873474087f)
Andy Hung [Wed, 13 Mar 2019 02:39:03 +0000 (19:39 -0700)]
AudioFlinger: Prevent multiple effect chains with same sessionId
Allow at most one effect chain with same sessionId on mPlaybackThreads.
Test: poc, CTS effect tests
Bug:
123237974
Merged-In: Ide46cd23b0a9f4295f0dca2fea23379a76b836ee
Change-Id: Ide46cd23b0a9f4295f0dca2fea23379a76b836ee
(cherry picked from commit
1631f06feb36df5406ad00e850dcca9394f67772)
(cherry picked from commit
f963b2bfdaf406b42d371322402172b4380bbba5)
Ray Essick [Tue, 26 Feb 2019 23:47:01 +0000 (15:47 -0800)]
Reserve enough space for RTSP CSD
make parameters to GetSizeWidth() reflect values being used in
corresponding EncodeSize() invocations so we won't overflow the buffer.
Bug:
123701862
Test: y
Change-Id: I78596176e6042c95582494a8ae1b9c3160bf5955
(cherry picked from commit
c025be8ce5f1b34bdf293ac367685c969bd430ba)
Andy Hung [Thu, 10 Jan 2019 21:27:31 +0000 (13:27 -0800)]
AudioFlinger: put effect desc lookup under mutex for createEffect
Test: native poc
Bug:
122309228
Change-Id: I48333c69f5c1b1bf1b98f57eb813ec39e074f3a7
Merged-In: I9d339a7d6d81161065e1adaf427dd2d3430436c2
(cherry picked from commit
a41770b682117fdfc20236fbc45d975099f9147a)
Phil Burk [Mon, 3 Dec 2018 18:10:21 +0000 (10:10 -0800)]
RESTRICT AUTOMERGE: aaudio: improve test_atomic_fifo
Check for the effects of setting a bogus counter.
Check for writes to memory surrounding the FIFO.
Check for negative array indices.
Bug:
120789744
Test: this is a test
Change-Id: Ia30cdef7f9d60f0a98b9af964cb3b3159df37dc9
(cherry picked from commit
31a8d44075f37f75d5912d79a43d777587b2d695)
Phil Burk [Mon, 3 Dec 2018 22:16:46 +0000 (14:16 -0800)]
RESTRICT AUTOMERGE: aaudio: Fix converting negative FIFO counters to index
The index into the FIFO is calculated by using:
counter % capacity
But the counter is signed and when it is negative the
modulo can have a negative result. That can cause
a negative array index and an access out of bounds.
This is not normally a problem because the counter
is 64 bits and it will not overflow until the audio
has run for a few million years. But a hacker might
be able to modify this internal counter and force
an error.
The solution involves casting to a uint64_t before doing
the modulo.
Note that there may still be a discontinuity when the
counter wraps from -1 to 0. But that will not result
in an out-of-bounds access. It may cause a noise but
an app could simply create a noise directly. So that is
not considered an exploit.
Bug:
120789744
Test: test_atomic_fifo.cpp
Change-Id: I6fe57bcb44528d29b5edb817c592e5e9a8aaf8eb
(cherry picked from commit
d1fc53ca84b3d8d074fb27e192dea8204c1fb221)
Phil Burk [Sat, 21 Apr 2018 00:24:38 +0000 (17:24 -0700)]
RESTRICT AUTOMERGE: aaudio: fix FIFO wrapround frame counts
The number of frames in the second part was incorrect
when it wrapped past the end of the FIFO.
Bug:
78139448
Bug:
120789744
Test: adb shell aaudio_loopback -c2 -C2 -tm -m2 -Pl -pn
Change-Id: Ib6a22f30f0ee5321444c6d6137d9488943c34f3d
(cherry picked from commit
685607be811e6d5fffc407d71a2703de9c351969)
ray-cy.lee [Tue, 7 Mar 2017 10:25:15 +0000 (18:25 +0800)]
CTS error while media dump()
MediaExtractor should not dump information. CTS is
checking and failing due to the dump.
Bug:
114770654
Change-Id: Ie5bae5de39545dede6da4198240b4f38c50050b7
(cherry picked from commit
c20825bd3b751cffcd8d7e66e97c3b1a91ef21e0)
akirilov [Mon, 9 Jul 2018 22:28:01 +0000 (15:28 -0700)]
MediaExtractor: stop rendering when an error occurs
Bug:
68664359
Bug:
110435401
Test: cts-tradefed run cts -m CtsSecurityTestCases -t android.security.cts.StagefrightTest#testStagefright_bug_68664359
Test: cts-tradefed run cts -m CtsSecurityTestCases -t android.security.cts.StagefrightTest#testStagefright_bug_110435401
Change-Id: Icff96fcaa76a5871e7f175b0384d47d5dca7313f
Merged-In: If1322524fcfebc6c5f139288f044b0189da66c1b
(cherry picked from commit
9bc021a323873091ea98f77b3b3dc4732d1c92e6)
Chong Zhang [Fri, 24 Aug 2018 21:49:33 +0000 (14:49 -0700)]
Fix race condition for cas sessions -- DO NOT MERGE
Change the session to shared_ptr and use atomic_load/store.
Test: POC; CTS MediaCasTest; CTS MediaDrmClearkeyTest#
testClearKeyPlaybackMpeg2ts
bug:
113027383
Change-Id: I75f4cb33a022f28d45918442d64c5c46df2640ef
(cherry picked from commit
58b9e7d73c9e2a7a7ff11a4584fd1e1105669831)
Marco Nelissen [Tue, 31 Jul 2018 22:12:51 +0000 (15:12 -0700)]
Check for overflow of crypto size
Bug:
111603051
Test: CTS
Change-Id: Ib5b1802b9b35769a25c16e2b977308cf7a810606
(cherry picked from commit
d1fd02761236b35a336434367131f71bef7405c9)
Jeff Tinker [Tue, 24 Jul 2018 21:13:13 +0000 (14:13 -0700)]
Fix information disclosure in mediadrmserver
Test:POC provided in bug
Bug:
79218474
Change-Id: Iba12c07a5e615f8ed234b01ac53e3559ba9ac12e
(cherry picked from commit
c1bf68a8d1321d7cdf7da6933f0b89b171d251c6)
Ryan Longair [Tue, 21 Aug 2018 19:01:16 +0000 (12:01 -0700)]
Revert "MediaExtractor: stop rendering when an error occurs"
This reverts commit
f3239784597d0dfd0d8405c9407180d282990806.
Robert Shih [Thu, 12 Jul 2018 23:17:45 +0000 (16:17 -0700)]
M3UParser: handle missing EXT-X-MEDIA URIs
Bug:
111381540
Test: http://devimages.apple.com.edgekey.net/streaming/examples/bipbop_16x9/bipbop_16x9_variant.m3u8
Change-Id: I57f6cea59ce4c25267385289ab805eefe74b04ac
(cherry picked from commit
b8c3a74de55a76e2ee21c731828a8afca7aa4ae0)
Toshikazu Saito [Tue, 10 Jul 2018 06:38:38 +0000 (15:38 +0900)]
Allow kPortModeDynamicANWBuffer for kBufferTypeANWBuffer in useBuffer
Test: play contents
Bug:
77486542
Change-Id: I422d49a137889c417d855ebef954f882f67821ed
(cherry picked from commit
d8cbab144398d0e9b3cdc2f8c42b4ea0c921e355)
akirilov [Mon, 9 Jul 2018 22:28:01 +0000 (15:28 -0700)]
MediaExtractor: stop rendering when an error occurs
Bug:
68664359
Bug:
110435401
Test: cts-tradefed run cts -m CtsSecurityTestCases -t android.security.cts.StagefrightTest#testStagefright_bug_68664359
Test: cts-tradefed run cts -m CtsSecurityTestCases -t android.security.cts.StagefrightTest#testStagefright_bug_110435401
Change-Id: Icff96fcaa76a5871e7f175b0384d47d5dca7313f
Merged-In: If1322524fcfebc6c5f139288f044b0189da66c1b
(cherry picked from commit
9bc021a323873091ea98f77b3b3dc4732d1c92e6)
Sanjay Singh [Wed, 23 May 2018 11:35:13 +0000 (17:05 +0530)]
OMXNodeInstance: Allow dynamic native handle mode for input buffers
Some camera implementation uses Dynamic native handle to send input
buffers to OMX HAL. Therefore, these buffers should be allowed.
Bug:
77486542
Bug:
80174666
Bug:
80210572
Bug:
80252747
Test: sts-tradefed run sts -m StsHostTestCases -t android.security.sts.Poc18_06#testPocBug_77486542
Test: adb shell am instrument -e size small -w 'android.media.cts/android.support.test.runner.AndroidJUnitRunner'
Test: adb shell am instrument -e class android.hardware.cts.CameraTest -w 'android.camera.cts/android.support.test.runner.AndroidJUnitRunner'
Test: adb shell am instrument -e class android.hardware.multiprocess.camera.cts.CameraEvictionTest -w 'android.camera.cts/android.support.test.runner.AndroidJUnitRunner'
Test: Exercise secure playback with Play Movies app.
Test: Record video with Camera app and play it back with Photos app
Change-Id: I1e4eb72e070f4e60ff4df94f9b9d161361828477
(cherry picked from commit
bda339098d273066fe50d4cb77503bac5ea4ede0)
Marco Nelissen [Fri, 1 Jun 2018 17:48:25 +0000 (10:48 -0700)]
Fix possible out of bounds read
Bug:
78656554
Test: manual
Change-Id: I677f827483dcc80afac57fd7ef6807e633542252
(cherry picked from commit
3762e0615273f25b059556d5b5f65102e9c55c35)
Robert Shih [Fri, 1 Jun 2018 22:09:21 +0000 (15:09 -0700)]
M3UParser: make url on demand
Bug:
77823362
Test: adb shell am start -a android.intent.action.VIEW -d http://10.42.0.1:8080
Change-Id: Ieaf8a13985277eee5b085ed243205a597627cf5e
(cherry picked from commit
26e236bd426770869644a9962778dedea7bf59be)
Wonsik Kim [Tue, 1 May 2018 20:18:11 +0000 (13:18 -0700)]
omx: restrict useBuffer according to buffer type and port mode
Bug:
77486542
Test: sts-tradefed run sts -m StsHostTestCases -t android.security.sts.Poc18_06#testPocBug_77486542
Test: adb shell am instrument -e size small -w 'android.media.cts/android.support.test.runner.AndroidJUnitRunner'
Test: Exercise secure playback with Play Movies app.
Test: Record video with Camera app and play it back with Photos app
Change-Id: Ief2d2d4d0445074c0ecdc723b1b25997a7631389
(cherry picked from commit
7d54e8f905784fddcc4c37fd094d4e18a73767bc)
Jeff Tinker [Thu, 19 Apr 2018 23:23:21 +0000 (16:23 -0700)]
Fix security vulnerability in CryptoHal
CryptoHal was not checking that the memory heap set by setHeap
was the same one that was actually used for the decrypt call, allowing
the caller to spoof the decrypt call into accessing arbitrary memory.
bug:
76221123
test: mediadrmserverpoc included in the bug & GTS media tests
Change-Id: I35214a1a6d0a4b864123e147d1a1adc2377bfbc5
Merged-in: I4ae6d1080be406bf53e3617c59c75206cc5066c6
(cherry picked from commit
9a9c3ab4d76f03f3abb3756bca9cdfe55c74326a)
Robert Shih [Wed, 9 May 2018 22:16:17 +0000 (15:16 -0700)]
Speed up id3v2 unsynchronization
Instead of doing many overlapping memmoves, do a single copy pass
that skips over the inserted unsynchronization bytes. For some
files this reduces parsing time from minutes to milliseconds.
Similar to commit
72a43b68da but for v2.2 and v2.3.
Bug:
78029004
Test: poc
Change-Id: I735b7051e77a093d86fb7a3e46209875946225ed
(cherry picked from commit
f9d87cc850a589b9b0cc3658cf222187822bcc00)
Phil Burk [Tue, 1 May 2018 20:03:52 +0000 (13:03 -0700)]
aaudio: use weak pointer to prevent UAF
Avoid using the mServiceEndpoint smart pointer
from multiple threads.
Bug:
74122779
Test: see bug for test instructions
Merged-In: Idaf9e32a163b25e51bde35d6f5ea10a372b5d916
Change-Id: Idaf9e32a163b25e51bde35d6f5ea10a372b5d916
(cherry picked from commit
92c3e26338637a7ddac54988187c89fb0fe49430)
Chong Zhang [Thu, 19 Apr 2018 17:59:17 +0000 (10:59 -0700)]
Add minimum size check for ImageGrid atom
bug:
73927042
Change-Id: I25dc3aeabe95bd907a418b12b2d06f3691cb1b42
(cherry picked from commit
ef75163eb891b5259c0f5c2fc20fca2a5a47b7b7)
Andy Hung [Thu, 12 Apr 2018 18:06:56 +0000 (11:06 -0700)]
Sanitize effect descriptors for AudioPolicyService binder calls.
Zero initialize structs before parcel read, if status is not checked.
Sanitize parcel read audio_port_config.
Test: Audio CTS, See bug for POC
Bug:
73126106
Merged-in: Iece43eb463385927e6babcf93654eea8aaebc29c
Change-Id: Iece43eb463385927e6babcf93654eea8aaebc29c
(cherry picked from commit
498bdcc90bc470a79bf8943cbac64502f7c1c091)
Ryszard Grzesica [Tue, 29 Dec 2015 05:28:44 +0000 (06:28 +0100)]
Add check preventing div0 issue
There might be a scenario while period is zero or after including
precision would be zero, prevent from division in that case and
return false (to use previously used period).
Bug:
73898703
bug:
74067957
Test: run playback as stability test
Change-Id: I3fad1060b095b7b5ea4c1f9cb3f9d42a4c503560
(cherry picked from commit
27e47ce3c3bbc0b4dc629163de7ebbba7e80b149)
jiabin [Fri, 6 Apr 2018 00:16:20 +0000 (17:16 -0700)]
Init gain config to prevent uninit leak.
In AudioPortConfig, we only initialize index for audio_gain_config, but
not other fields. That may cause uninit leak at listAudioPorts and
listAudioPatches.
Bug:
77238250
Bug:
77238762
Test: try repo steps at the bug description.
Change-Id: I57e3bd0598f9aa698a6fa3d3c0218b046de34e2f
(cherry picked from commit
ebe0777edcf3b9c6bde9771d65399e2363dc6e40)
Sungtak Lee [Mon, 5 Mar 2018 23:21:33 +0000 (15:21 -0800)]
Handle overflow in android::HeifDataSource::readAt
Bug:
73782357
Change-Id: I03a5b4c5ddaf2664f342973da7f1a79f29cd7be5
(cherry picked from commit
237f9034c6cbe5cbafb0cd4c862d9dddfbdf7389)
Ray Essick [Tue, 6 Mar 2018 23:55:29 +0000 (15:55 -0800)]
better mpeg2 TS elementary stream Access Unit parsing
mpeg2 es stream access units have a 3 byte prefix and a 1 byte start
code. Searching for the next access unit started after the prefix
instead of after the start byte.
Bug:
74114680
Test: ran POC before/after
(cherry picked from commit
371066d073c5db289b0f38b9d2bfd3e326c78c66)
Chong Zhang [Tue, 27 Feb 2018 20:43:06 +0000 (12:43 -0800)]
heif: use width and height for decoder -- DO NOT MERGE
The display dimensions from MPEG4Extractor is applied on top
of width and height for scaling, it's not for cropping. For
bitmap uses we have to use width and height, the frame from
media server is not scaled.
This required porting over some fixes from master to fix the
display size vs. image size reporting, otherwise images with
grids may show a black border at the bottom or right.
bug:
73172046
Test: test app in bug; open folders with heif files in Photos
and Downloads; CTS MediaMetadataRetrieverTest.
Change-Id: I3d7f1492d08d48876836ccc05b6eb4de0d0c0f9a
(cherry picked from commit
49d4aa0a7407ea6632c4a3441c7a4d922d003ea5)
Dongwon Kang [Fri, 23 Feb 2018 16:59:27 +0000 (08:59 -0800)]
Handle bad bitrate index in mp3dec.
Reference:
https://www.mp3-tech.org/programmer/frame_header.html
Test: run poc with and without this patch.
Bug:
71868329
Change-Id: Ibf6196eba0b99459e84989ac8c13db57c816c572
(cherry picked from commit
8b638123760bd93958f6cc2f5c7c4f5dbd0a754a)
Robert Shih [Fri, 9 Feb 2018 20:19:35 +0000 (12:19 -0800)]
M3UParser: detect variant streams without EXT-X-STREAM-INF
Bug:
68399439
Change-Id: I95207b40f23a5f927da7154f9a952046118b5cad
(cherry picked from commit
f3e0afb82f104d6e9986779ba2cf548c6aab1092)
Ray Essick [Tue, 6 Feb 2018 19:25:31 +0000 (11:25 -0800)]
Check NAL size before looking inside
Add a check to ensure we have a non-zero size for a NAL while
parsing before we crack said NAL open to see what type it is.
Bug:
72117051
Test: compilation
Change-Id: Iaa3ebb2daae5d9225060a11e9adbb6757a168656
Merged-In: I607c67a320b33b991476db30d78223cf4386c0e8
(cherry picked from commit
e0c020969d88891b0b71bb938778e9ca762e8035)
Pawin Vongmasa [Sun, 17 Dec 2017 10:31:18 +0000 (02:31 -0800)]
Refactor MediaPlayerBase's notify
Test: make cts -j123 && cts-tradefed run cts-dev -m \
CtsMediaTestCases --compatibility:module-arg \
CtsMediaTestCases:include-annotation:\
android.platform.test.annotations.RequiresDevice
Bug:
70546581
Change-Id: Ia3a8eb99c2faf6935c63800ba08f65970cede48e
(cherry picked from commit
082e4f75a383f957a6ed9186ca0692b694e1ce45)
Pawin Vongmasa [Tue, 12 Dec 2017 09:56:40 +0000 (01:56 -0800)]
Prevent MediaPlayerService::Client's use-after-free
Test: make cts -j123 && cts-tradefed run cts-dev -m \
CtsMediaTestCases --compatibility:module-arg \
CtsMediaTestCases:include-annotation:\
android.platform.test.annotations.RequiresDevice
Bug:
70546581
Merged-In: Ia142a7735c6685eb67b2c00917c0ed5ea7e0da9e
Change-Id: Ia142a7735c6685eb67b2c00917c0ed5ea7e0da9e
(cherry picked from commit
d27ad6bae3215db0ed174f5f036339c9515fbba7)
(cherry picked from commit
028cf0973f928503e89124c3f6493a5226826ed9)
Jeff Tinker [Fri, 12 Jan 2018 01:46:16 +0000 (17:46 -0800)]
Fix use of uninitialized value in libmediadrm
bug:
70526702
test:gts media tests
Change-Id: I29a67dad01ca8c8f649ba12cf08cc86b7eb56523
(cherry picked from commit
2442047f5c6d368f69fa81917f5aabc9b3c342a0)
Jeff Tinker [Thu, 11 Jan 2018 08:14:53 +0000 (00:14 -0800)]
Fix potential buffer overflow in mediadrmserver
bug:
71389378
test: gts media tests
Change-Id: Ic7d4b456bc874b92fbe202e3dafb7ceac747ebc7
(cherry picked from commit
5231cc164fe040a3ab5fcb28baae4e0a4f9fdf4c)
Robert Shih [Thu, 11 Jan 2018 22:38:23 +0000 (14:38 -0800)]
AACExtractor: check bounds during seek
Bug:
70239507
Test: stagefright -a poc.aac
Change-Id: I61225a04c76fe8855bd2591fb14b734099fa3be6
(cherry picked from commit
0790581021d89ae1d7242e5eb1197bfd12725c85)
Robert Shih [Sat, 2 Dec 2017 00:12:08 +0000 (16:12 -0800)]
httplive: check for malformed EXT-X-STREAM-INF
Bug:
68342866
Test: adb shell am start -a android.intent.action.VIEW -d http://localhost:1137/index.html
Change-Id: I479f9e0b7ca828d048ef88b23b4948e3c1472b3c
(cherry picked from commit
e3bd8dd81e51b4d02484e7eec0d725ba9c254c68)
Kevin Rocard [Mon, 13 Nov 2017 19:15:27 +0000 (11:15 -0800)]
IAudioPolicyService: Add attribute tags sanitization
When audio_attributes_t was read from the binder parcel,
the string tags field was copied without checking that
it contained a '\0'.
This could lead to read past the end when tags were used.
This patch always adds a '\0' at the end of the buffer when
deserializing.
Bug:
68953950
Test: manual playback/record
Test: send binder payload without \0 in tags attribute, check that only
AUDIO_ATTRIBUTES_TAGS_MAX_SIZE - 1 char are printed.
Change-Id: I285258cbf7cfaf26b191d1f31b3b1e2d724c4934
Merged-In: I285258cbf7cfaf26b191d1f31b3b1e2d724c4934
Signed-off-by: Kevin Rocard <krocard@google.com>
(cherry picked from commit
39fdbd097a147b5c719dac9ad2759e6c44eb3a4e)
Dongwon Kang [Tue, 21 Nov 2017 01:55:24 +0000 (17:55 -0800)]
Apply input buffer validation also to AVC and MPEG4 encoders
Input buffer validation is existing only on VPX encoders. This patch
applies the checking also to the other sw video encoders.
Bug:
69065651 Bug:
27569635
Test: run poc with and without the patch.
Test: pass post submit media CTS tests after disabling hw encoders.
Merged-In: I1358df64352577fd6d41cd4bfec18be37c98fe6f
Change-Id: I1358df64352577fd6d41cd4bfec18be37c98fe6f
(cherry picked from commit
fed57366c58aa69ad8f1df5191d6bf48e58d86a8)
Naveen Kumar P [Wed, 4 Oct 2017 04:40:39 +0000 (10:10 +0530)]
Access AVCDEC context after create fail check
Bug:
66969281
Change-Id: I7c293417079da991cfad675a2d5563423d751610
(cherry picked from commit
8e6a6fe2e1542b3333ffecb7307a5de671c8a785)
Edwin Wong [Sat, 7 Oct 2017 01:21:06 +0000 (18:21 -0700)]
Validate decryption key length to decrypt function.
Cherry picked from http://go/ag/
3038278.
AesCtrDecryptor::decrypt() doesn't check whether the size of "key"
is equal to 16 bytes, which may lead to an OOB read problem in the
context of mediadrmserver.
Add DecryptsWithEmptyKey and DecryptsWithKeyTooLong unit tests.
Test: ClearKeyDrmUnitTest
adb shell LD_LIBRARY_PATH="/vendor/lib/mediadrm"
/data/nativetest/ClearKeyDrmUnitTest/ClearKeyDrmUnitTest
bug:
63982768
Change-Id: I1f22c9df2b051972b2c532608b7f203e3ce77926
(cherry picked from commit
379b672b189aa72ce0103b485019022f3e292c36)
Ray Essick [Thu, 12 Oct 2017 17:15:31 +0000 (10:15 -0700)]
avoid 32-bit integer overflow
change calculation to scale encoder delay and padding when sample rate
changes to use 64-bit math and avoid possible 32-bit overflow.
Bug:
67737022
Test: re-ran affected use case
Change-Id: I6e37341256f3f0e3274ffdd3bad284eaacac25ab
(cherry picked from commit
73e95a9bd43724058651cb11c58dbe3fae651d56)
(cherry picked from commit
e0d1b3816e73629029f552da5df31ef31bde2c19)
Mikhail Naganov [Tue, 24 Oct 2017 21:44:43 +0000 (14:44 -0700)]
Add EFFECT_CMD_SET_PARAM parameter checking to Preset Reverb
Bug:
67647856
Test: Added CTS tests
Change-Id: I027ce8f7a1cdb8406ca423aaae7c45b6b76617f0
(cherry picked from commit
ee804dfa15cc2d34e5d67a9b437cd023349d633b)
Pawin Vongmasa [Thu, 28 Sep 2017 12:31:11 +0000 (05:31 -0700)]
Protect against possible race conditions
Test: make cts -j123 && cts-tradefed run cts-dev -m \
CtsMediaTestCases --compatibility:module-arg \
CtsMediaTestCases:include-annotation:\
android.platform.test.annotations.RequiresDevice
Test: Run the poc in b/
38234812
Bug:
38234812
Change-Id: I28322e5a812c02c8e449ab8773715f60b9f5d976
(cherry picked from commit
f9c81464b9494082fa7cdff9f70c5402e8ac78c0)
Harish Mahendrakar [Thu, 5 Oct 2017 08:48:26 +0000 (14:18 +0530)]
SoftAVCDec: Handle zero length input without EOS
When a zero length input buffer is sent to SoftAVC decoder
without EOS set in nFlags, SoftAVC decoder plugin was
entering an infinite loop. Fixed it by returning from
onQueueFilled for such cases.
Bug:
66969349
Test: Tested using poc associated with the bug
Change-Id: I79cebc8f5b40c51256aba83a08deb547b220c4d7
(cherry picked from commit
21943c05f0ee2350647a6fa5ee17aa3c68859383)
Naveen Kumar P [Wed, 4 Oct 2017 04:25:14 +0000 (09:55 +0530)]
Access HEVC context after create fail check
Bug:
66969193
Change-Id: Icd1c8d78986e3795ba7f1c1d50ebeb90d77f6178
(cherry picked from commit
2bee8317ecfa5dca3c43d99db40491c4e28f832d)
Marco Nelissen [Mon, 9 Oct 2017 21:59:43 +0000 (14:59 -0700)]
Fix edge case when applying id3 unsynchronization
Bug:
63100526
Test: opened poc, other files
Change-Id: I0a51a2a11d0ea84ede0c075de650a7118f0e00c5
(cherry picked from commit
3e70296461c5f260988ab21854a6f43fdafea764)
android-build-team Robot [Thu, 9 Nov 2017 05:44:32 +0000 (05:44 +0000)]
Merge cherrypicks of [
3196053,
3195996,
3195997,
3195998,
3196073,
3196093,
3196113,
3195934,
3195999,
3196074,
3196133,
3196134,
3195914,
3195915,
3195916] into oc-mr1-release
Change-Id: I95acbaa82a1bc595d122bab54fb7a4e25e37d4ff
Yin-Chia Yeh [Tue, 7 Nov 2017 01:16:22 +0000 (17:16 -0800)]
Camera NDK: fix bug in lock order
AImage::close() can be called by AImageReader while holding
AImageReader::mLock.
Also fix ACaptureFailure double free issue.
Test: AR test app + CTS stress
Bug:
68885255
Change-Id: I17037e3e30e0f53b35ca538a3f321693c539cbdc
Merged-In: I17037e3e30e0f53b35ca538a3f321693c539cbdc
(cherry picked from commit
a10ab5bfd1ca27128fdbe43ce58a68e92b2896a1)
android-build-team Robot [Thu, 2 Nov 2017 04:50:45 +0000 (04:50 +0000)]
Merge cherrypicks of [
3156476,
3155698,
3156194,
3156639,
3156018,
3156477,
3156098,
3156099,
3156100,
3156101,
3156102,
3158393,
3155699,
3155700,
3156195,
3156196,
3156019,
3156020,
3158394] into oc-mr1-release
Change-Id: I107302823b3d3d6a219bdf2caa8909e185ae227a
Phil Burk [Thu, 26 Oct 2017 19:11:47 +0000 (12:11 -0700)]
aaudio: fix loss of sync with HW FIFO index
This fixes a problem with intermittent severe distortion
and variable latency after restarting a stream.
Bug:
68003241
Test: write_sine_callback -pl -m2 -n2 -s5 -c2 -l100
Merged-In: Id7418adb86f2869ac74936cfbd365815a0a0e923
Change-Id: Id7418adb86f2869ac74936cfbd365815a0a0e923
(cherry picked from commit
999e110dac3783df71e5606be1d86f1b122145c0)
android-build-team Robot [Mon, 23 Oct 2017 02:34:35 +0000 (02:34 +0000)]
Snap for
4411005 from
c347c2eaf87c640d664f623f90a3ec6383bfe4f7 to oc-mr1-release
Change-Id: I8dc053f7aa057562253b2d0879c23afef32fec36
Marco Nelissen [Fri, 20 Oct 2017 17:44:43 +0000 (17:44 +0000)]
Fix build am:
48caffe6fe am:
1da4542abd -s ours am:
ab486b087e am:
04b334a98d am:
f231e8b680 am:
31b9dbb43b am:
d799181f51 am:
7edb039dde am:
7cc9d6763e am:
5ff79c2a46 am:
6abd03fa5d am:
7947199a58
am:
490e643cc1
Change-Id: I7480b25c2dca3b4ea23d470927004a7735e99512
Lajos Molnar [Fri, 20 Oct 2017 17:43:06 +0000 (17:43 +0000)]
Merge "OMXNodeInstance: use a lock in freeNode" into lmp-dev am:
288566faba -s ours am:
2a5e425ab4 am:
96c2fafc29 am:
b9da9fc1aa am:
ee22f8a68e am:
efd26f8a61 am:
2d073bdd1e am:
f5eb536d90 am:
27bdac8e05 am:
fab889e9e6 am:
44a79a8db8 am:
bdbb380663
am:
102b970dfb
Change-Id: I39ac02c1bca2764988c92b13ec4f83cedd7b8fa7
Eric Laurent [Fri, 20 Oct 2017 17:41:18 +0000 (17:41 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-dev am:
1a721bb633 -s ours am:
5a1dae0cea -s ours am:
fa5253c8bc -s ours am:
021923a373 -s ours am:
c798254fba -s ours am:
37e801176e -s ours am:
63b868e27b -s ours am:
68d7af9137 -s ours am:
4efb8774ab -s ours am:
94a417ca10 -s ours am:
8fc33c4f75 -s ours am:
ec248b8ddd -s ours
am:
8334241619 -s ours
Change-Id: Ibbb5bbadc73c6977d3adc41ba009c597bb30bd48
Marco Nelissen [Fri, 20 Oct 2017 17:40:43 +0000 (17:40 +0000)]
Fix build am:
48caffe6fe am:
1da4542abd -s ours am:
ab486b087e am:
04b334a98d am:
f231e8b680 am:
31b9dbb43b am:
d799181f51 am:
7edb039dde am:
7cc9d6763e am:
5ff79c2a46 am:
6abd03fa5d
am:
7947199a58
Change-Id: Ib6d53bed55ea0dfdea977451fdaaffc5230068fa
Eric Laurent [Fri, 20 Oct 2017 17:39:00 +0000 (17:39 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-mr1-dev am:
b6b4443dbb am:
74684f638b am:
af5ce97781 am:
7190597c26 am:
5de64b02a3 -s ours am:
2ed01f0006 -s ours am:
1ade78dc5d -s ours am:
c75c947a42 -s ours am:
849a10fce0 -s ours am:
faee2cdf2d -s ours am:
836b713352 -s ours
am:
24e679966e -s ours
Change-Id: Icb2e6e40f83b2cb6b63f81c2ae43fe3d2fb58a36
Lajos Molnar [Fri, 20 Oct 2017 17:38:54 +0000 (17:38 +0000)]
Merge "OMXNodeInstance: use a lock in freeNode" into lmp-dev am:
288566faba -s ours am:
2a5e425ab4 am:
96c2fafc29 am:
b9da9fc1aa am:
ee22f8a68e am:
efd26f8a61 am:
2d073bdd1e am:
f5eb536d90 am:
27bdac8e05 am:
fab889e9e6 am:
44a79a8db8
am:
bdbb380663
Change-Id: Ic2b6af7ef99ef64ec5788e33da457ea06e26b1db
Lajos Molnar [Fri, 20 Oct 2017 17:36:48 +0000 (17:36 +0000)]
Merge "OMXNodeInstance: use a lock in freeNode" into lmp-mr1-dev am:
60719598d5 am:
cdf0a102d9 am:
57ac76182e am:
36950f753b am:
a4cc48a3ae am:
f3b4e5d222 am:
73a7e98790 am:
0b306b0517 am:
bef1ae9f4d am:
6c930ece3c -s ours am:
40f6d8a086
am:
29f32408c6
Change-Id: Ic3e2840753f5c07f951dd37ffe8c37cacd2b9851
Eric Laurent [Fri, 20 Oct 2017 17:36:44 +0000 (17:36 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-dev am:
1a721bb633 -s ours am:
5a1dae0cea -s ours am:
fa5253c8bc -s ours am:
021923a373 -s ours am:
c798254fba -s ours am:
37e801176e -s ours am:
63b868e27b -s ours am:
68d7af9137 -s ours am:
4efb8774ab -s ours am:
94a417ca10 -s ours am:
8fc33c4f75 -s ours
am:
ec248b8ddd -s ours
Change-Id: I254dc5daa9e38e99ce5ae687e2953a8db8f725cf
Marco Nelissen [Fri, 20 Oct 2017 17:33:31 +0000 (17:33 +0000)]
Fix build am:
48caffe6fe am:
1da4542abd -s ours am:
ab486b087e am:
04b334a98d am:
f231e8b680 am:
31b9dbb43b am:
d799181f51 am:
7edb039dde am:
7cc9d6763e am:
5ff79c2a46
am:
6abd03fa5d
Change-Id: Iec6b0ffc5c6d47b85e3d5c0838ed67811696ad37
Eric Laurent [Fri, 20 Oct 2017 17:33:17 +0000 (17:33 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-mr1-dev am:
b6b4443dbb am:
74684f638b am:
af5ce97781 am:
7190597c26 am:
5de64b02a3 -s ours am:
2ed01f0006 -s ours am:
1ade78dc5d -s ours am:
c75c947a42 -s ours am:
849a10fce0 -s ours am:
faee2cdf2d -s ours
am:
836b713352 -s ours
Change-Id: Ib504331838fb576686547c925c9266c729e47022
Lajos Molnar [Fri, 20 Oct 2017 17:32:21 +0000 (17:32 +0000)]
Merge "OMXNodeInstance: use a lock in freeNode" into lmp-dev am:
288566faba -s ours am:
2a5e425ab4 am:
96c2fafc29 am:
b9da9fc1aa am:
ee22f8a68e am:
efd26f8a61 am:
2d073bdd1e am:
f5eb536d90 am:
27bdac8e05 am:
fab889e9e6
am:
44a79a8db8
Change-Id: Ie99043ef52945872e51aecf603ee4a1e7100daed
Lajos Molnar [Fri, 20 Oct 2017 17:31:54 +0000 (17:31 +0000)]
Merge "OMXNodeInstance: use a lock in freeNode" into lmp-mr1-dev am:
60719598d5 am:
cdf0a102d9 am:
57ac76182e am:
36950f753b am:
a4cc48a3ae am:
f3b4e5d222 am:
73a7e98790 am:
0b306b0517 am:
bef1ae9f4d am:
6c930ece3c -s ours
am:
40f6d8a086
Change-Id: I95971b8e76a4b6941fcb892787c9990bcdb5256c
Eric Laurent [Fri, 20 Oct 2017 17:30:49 +0000 (17:30 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-dev am:
1a721bb633 -s ours am:
5a1dae0cea -s ours am:
fa5253c8bc -s ours am:
021923a373 -s ours am:
c798254fba -s ours am:
37e801176e -s ours am:
63b868e27b -s ours am:
68d7af9137 -s ours am:
4efb8774ab -s ours am:
94a417ca10 -s ours
am:
8fc33c4f75 -s ours
Change-Id: I8b37d6a44110f341cb2100764a6d36c3c1fdfa9d
Eric Laurent [Fri, 20 Oct 2017 17:29:07 +0000 (17:29 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-mr1-dev am:
b6b4443dbb am:
74684f638b am:
af5ce97781 am:
7190597c26 am:
5de64b02a3 -s ours am:
2ed01f0006 -s ours am:
1ade78dc5d -s ours am:
c75c947a42 -s ours am:
849a10fce0 -s ours
am:
faee2cdf2d -s ours
Change-Id: I44a1b689d2b395e477b5b9e145228e31ebf8b870
Lajos Molnar [Fri, 20 Oct 2017 17:27:38 +0000 (17:27 +0000)]
Merge "OMXNodeInstance: use a lock in freeNode" into lmp-mr1-dev am:
60719598d5 am:
cdf0a102d9 am:
57ac76182e am:
36950f753b am:
a4cc48a3ae am:
f3b4e5d222 am:
73a7e98790 am:
0b306b0517 am:
bef1ae9f4d
am:
6c930ece3c -s ours
Change-Id: I46be3e647e626302ed089aeb9867ef760bb40661
android-build-team Robot [Fri, 20 Oct 2017 07:12:05 +0000 (07:12 +0000)]
Snap for
4407597 from
a671979428d39d9ea780500aaf2142f0833c133f to oc-mr1-release
Change-Id: I4a54eec6f1e55e21a04f1229104a819ab90c7604
Wei Jia [Fri, 20 Oct 2017 01:02:45 +0000 (01:02 +0000)]
Merge changes from topic "
b23270724" into lmp-dev am:
5802bad0f4 am:
49acc79a1d -s ours am:
c4f7665a60 am:
34acd22bf1 am:
05832e9282 am:
10449d6e14 am:
36cd95e899 am:
0be98247a4 am:
c2776e757a am:
0e3e26382e am:
f70515771a am:
e257e82907
am:
8e5265577c
Change-Id: I11699ecf93c643b5670649123edb00cba08c1044
Wei Jia [Fri, 20 Oct 2017 00:41:16 +0000 (00:41 +0000)]
Merge changes from topic "
b23270724" into lmp-dev am:
5802bad0f4 am:
49acc79a1d -s ours am:
c4f7665a60 am:
34acd22bf1 am:
05832e9282 am:
10449d6e14 am:
36cd95e899 am:
0be98247a4 am:
c2776e757a am:
0e3e26382e am:
f70515771a
am:
e257e82907
Change-Id: I9e7dd457c4a13e61c564e6432cdf8a41bc04d1a5
Wei Jia [Fri, 20 Oct 2017 00:10:03 +0000 (00:10 +0000)]
Merge changes from topic "
b23270724" into lmp-dev am:
5802bad0f4 am:
49acc79a1d -s ours am:
c4f7665a60 am:
34acd22bf1 am:
05832e9282 am:
10449d6e14 am:
36cd95e899 am:
0be98247a4 am:
c2776e757a am:
0e3e26382e
am:
f70515771a
Change-Id: I2acf505ec1c207f6b596bf33aaf7cf509fd3504a
Marco Nelissen [Fri, 20 Oct 2017 00:04:39 +0000 (00:04 +0000)]
Fix build am:
48caffe6fe am:
1da4542abd -s ours am:
ab486b087e am:
04b334a98d am:
f231e8b680 am:
31b9dbb43b am:
d799181f51 am:
7edb039dde am:
7cc9d6763e
am:
5ff79c2a46
Change-Id: If3196859118493351493ead6775fe2fdc890df32
Lajos Molnar [Fri, 20 Oct 2017 00:03:10 +0000 (00:03 +0000)]
Merge "OMXNodeInstance: use a lock in freeNode" into lmp-dev am:
288566faba -s ours am:
2a5e425ab4 am:
96c2fafc29 am:
b9da9fc1aa am:
ee22f8a68e am:
efd26f8a61 am:
2d073bdd1e am:
f5eb536d90 am:
27bdac8e05
am:
fab889e9e6
Change-Id: Ic1759237ef98d43f8115afc36c46b94c953f8c7d
Eric Laurent [Fri, 20 Oct 2017 00:01:09 +0000 (00:01 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-dev am:
1a721bb633 -s ours am:
5a1dae0cea -s ours am:
fa5253c8bc -s ours am:
021923a373 -s ours am:
c798254fba -s ours am:
37e801176e -s ours am:
63b868e27b -s ours am:
68d7af9137 -s ours am:
4efb8774ab -s ours
am:
94a417ca10 -s ours
Change-Id: Ia6b21fbd6eee7ea29838dea3d5222b74c68b7521
Eric Laurent [Thu, 19 Oct 2017 23:59:56 +0000 (23:59 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-mr1-dev am:
b6b4443dbb am:
74684f638b am:
af5ce97781 am:
7190597c26 am:
5de64b02a3 -s ours am:
2ed01f0006 -s ours am:
1ade78dc5d -s ours am:
c75c947a42 -s ours
am:
849a10fce0 -s ours
Change-Id: Ic1dc85dd5a6c2b6cd3cb53cacc6371d2f43a171f
Lajos Molnar [Thu, 19 Oct 2017 23:58:25 +0000 (23:58 +0000)]
Merge "OMXNodeInstance: use a lock in freeNode" into lmp-mr1-dev am:
60719598d5 am:
cdf0a102d9 am:
57ac76182e am:
36950f753b am:
a4cc48a3ae am:
f3b4e5d222 am:
73a7e98790 am:
0b306b0517
am:
bef1ae9f4d
Change-Id: I03fc5c223063fe012aef36f50c98e7155291cb1c
Wei Jia [Thu, 19 Oct 2017 23:56:53 +0000 (23:56 +0000)]
Merge changes from topic "
b23270724" into lmp-dev am:
5802bad0f4 am:
49acc79a1d -s ours am:
c4f7665a60 am:
34acd22bf1 am:
05832e9282 am:
10449d6e14 am:
36cd95e899 am:
0be98247a4 am:
c2776e757a
am:
0e3e26382e
Change-Id: I492ba3ce792c8a5584e619bed01fc501a8cf2fc3
Marco Nelissen [Thu, 19 Oct 2017 23:38:48 +0000 (23:38 +0000)]
Fix build am:
48caffe6fe am:
1da4542abd -s ours am:
ab486b087e am:
04b334a98d am:
f231e8b680 am:
31b9dbb43b am:
d799181f51 am:
7edb039dde
am:
7cc9d6763e
Change-Id: I873bf2fb8de3bca60f601ff936ac3ec98faad55e
Marco Nelissen [Thu, 19 Oct 2017 23:36:23 +0000 (23:36 +0000)]
Fix build am:
48caffe6fe am:
1da4542abd -s ours am:
ab486b087e am:
04b334a98d am:
f231e8b680 am:
31b9dbb43b am:
d799181f51
am:
7edb039dde
Change-Id: I578cdc02c156b11c649a388606d8f37288d3aebc
Lajos Molnar [Thu, 19 Oct 2017 23:34:38 +0000 (23:34 +0000)]
Merge "OMXNodeInstance: use a lock in freeNode" into lmp-dev am:
288566faba -s ours am:
2a5e425ab4 am:
96c2fafc29 am:
b9da9fc1aa am:
ee22f8a68e am:
efd26f8a61 am:
2d073bdd1e am:
f5eb536d90
am:
27bdac8e05
Change-Id: I5bacdd7761682d68361193b997a7dc7846228008
Eric Laurent [Thu, 19 Oct 2017 23:33:21 +0000 (23:33 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-dev am:
1a721bb633 -s ours am:
5a1dae0cea -s ours am:
fa5253c8bc -s ours am:
021923a373 -s ours am:
c798254fba -s ours am:
37e801176e -s ours am:
63b868e27b -s ours am:
68d7af9137 -s ours
am:
4efb8774ab -s ours
Change-Id: Ib1315607c45fe70f95eb54af666db6a6114c9e99
Eric Laurent [Thu, 19 Oct 2017 23:31:50 +0000 (23:31 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-mr1-dev am:
b6b4443dbb am:
74684f638b am:
af5ce97781 am:
7190597c26 am:
5de64b02a3 -s ours am:
2ed01f0006 -s ours am:
1ade78dc5d -s ours
am:
c75c947a42 -s ours
Change-Id: Idb5cc2015cca47cad52cd93b472913d532bdf6ba
Lajos Molnar [Thu, 19 Oct 2017 23:30:48 +0000 (23:30 +0000)]
Merge "OMXNodeInstance: use a lock in freeNode" into lmp-mr1-dev am:
60719598d5 am:
cdf0a102d9 am:
57ac76182e am:
36950f753b am:
a4cc48a3ae am:
f3b4e5d222 am:
73a7e98790
am:
0b306b0517
Change-Id: I127201e0209dfa53bd78138fa84c5543f4677990
Wei Jia [Thu, 19 Oct 2017 23:27:30 +0000 (23:27 +0000)]
Merge changes from topic "
b23270724" into lmp-dev am:
5802bad0f4 am:
49acc79a1d -s ours am:
c4f7665a60 am:
34acd22bf1 am:
05832e9282 am:
10449d6e14 am:
36cd95e899 am:
0be98247a4
am:
c2776e757a
Change-Id: Ida5e52d730bccdd76be82d7c69392f5be865ce35
Marco Nelissen [Thu, 19 Oct 2017 23:23:14 +0000 (23:23 +0000)]
Fix build am:
48caffe6fe am:
1da4542abd -s ours am:
ab486b087e am:
04b334a98d am:
f231e8b680 am:
31b9dbb43b
am:
d799181f51
Change-Id: I09d876848d3487f67719ef14e558773d335feb05
Lajos Molnar [Thu, 19 Oct 2017 23:18:49 +0000 (23:18 +0000)]
Merge "OMXNodeInstance: use a lock in freeNode" into lmp-dev am:
288566faba -s ours am:
2a5e425ab4 am:
96c2fafc29 am:
b9da9fc1aa am:
ee22f8a68e am:
efd26f8a61 am:
2d073bdd1e
am:
f5eb536d90
Change-Id: Ifea26b1a0a59362d01c0f60c01478cb5428b1ab5
Eric Laurent [Thu, 19 Oct 2017 23:17:30 +0000 (23:17 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-dev am:
1a721bb633 -s ours am:
5a1dae0cea -s ours am:
fa5253c8bc -s ours am:
021923a373 -s ours am:
c798254fba -s ours am:
37e801176e -s ours am:
63b868e27b -s ours
am:
68d7af9137 -s ours
Change-Id: I383dd11b76524bb9e1c3bde8d27429a0ddff5cce
Eric Laurent [Thu, 19 Oct 2017 23:16:33 +0000 (23:16 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-mr1-dev am:
b6b4443dbb am:
74684f638b am:
af5ce97781 am:
7190597c26 am:
5de64b02a3 -s ours am:
2ed01f0006 -s ours
am:
1ade78dc5d -s ours
Change-Id: Iaee2ff65a346cc0f8aafc5c7bd07e6467fb791ed
Lajos Molnar [Thu, 19 Oct 2017 23:15:15 +0000 (23:15 +0000)]
Merge "OMXNodeInstance: use a lock in freeNode" into lmp-mr1-dev am:
60719598d5 am:
cdf0a102d9 am:
57ac76182e am:
36950f753b am:
a4cc48a3ae am:
f3b4e5d222
am:
73a7e98790
Change-Id: Iae94781121218aaa0d22666bb88e367ad188344e
Wei Jia [Thu, 19 Oct 2017 23:14:11 +0000 (23:14 +0000)]
Merge changes from topic "
b23270724" into lmp-dev am:
5802bad0f4 am:
49acc79a1d -s ours am:
c4f7665a60 am:
34acd22bf1 am:
05832e9282 am:
10449d6e14 am:
36cd95e899
am:
0be98247a4
Change-Id: I0d8747c1b2944f488a4a64d56a721004ab62e300
Marco Nelissen [Thu, 19 Oct 2017 23:12:33 +0000 (23:12 +0000)]
Fix build am:
48caffe6fe am:
1da4542abd -s ours am:
ab486b087e am:
04b334a98d am:
f231e8b680
am:
31b9dbb43b
Change-Id: Iccbcf5b6c1227530b1198a33df4bf5080a6496e4
Lajos Molnar [Thu, 19 Oct 2017 23:04:38 +0000 (23:04 +0000)]
Merge "OMXNodeInstance: use a lock in freeNode" into lmp-dev am:
288566faba -s ours am:
2a5e425ab4 am:
96c2fafc29 am:
b9da9fc1aa am:
ee22f8a68e am:
efd26f8a61
am:
2d073bdd1e
Change-Id: I6e1fc676ee614b13229f1846f601fe26eb69ff62
Eric Laurent [Thu, 19 Oct 2017 23:03:25 +0000 (23:03 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-dev am:
1a721bb633 -s ours am:
5a1dae0cea -s ours am:
fa5253c8bc -s ours am:
021923a373 -s ours am:
c798254fba -s ours am:
37e801176e -s ours
am:
63b868e27b -s ours
Change-Id: I796c545395083ee7a50b3bf2a61ca06b99cef996
Eric Laurent [Thu, 19 Oct 2017 23:02:27 +0000 (23:02 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-mr1-dev am:
b6b4443dbb am:
74684f638b am:
af5ce97781 am:
7190597c26 am:
5de64b02a3 -s ours
am:
2ed01f0006 -s ours
Change-Id: I6bc9312bbe0257341931eedff3eb8480ef690854
Lajos Molnar [Thu, 19 Oct 2017 23:01:11 +0000 (23:01 +0000)]
Merge "OMXNodeInstance: use a lock in freeNode" into lmp-mr1-dev am:
60719598d5 am:
cdf0a102d9 am:
57ac76182e am:
36950f753b am:
a4cc48a3ae
am:
f3b4e5d222
Change-Id: I1b49e5ab4ed73322d7bd6c8d43df1d0d6f43c4fa
Marco Nelissen [Thu, 19 Oct 2017 23:00:31 +0000 (23:00 +0000)]
Fix build am:
48caffe6fe am:
1da4542abd -s ours am:
ab486b087e am:
04b334a98d
am:
f231e8b680
Change-Id: Ibe86820231c7c86aec093282fb7944abaa03b32d
Wei Jia [Thu, 19 Oct 2017 23:00:14 +0000 (23:00 +0000)]
Merge changes from topic "
b23270724" into lmp-dev am:
5802bad0f4 am:
49acc79a1d -s ours am:
c4f7665a60 am:
34acd22bf1 am:
05832e9282 am:
10449d6e14
am:
36cd95e899
Change-Id: I56bd94f89743e0aee8089fdb19d999f0f94bb26b
OSDN Git Service
