git.osdn.net Git - android-x86/frameworks-av.git/log

(root) / android-x86 / frameworks-av.git / log

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)

commit | commitdiff | tree

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)

commit | commitdiff | tree

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)

commit | commitdiff | tree

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)

commit | commitdiff | tree

android-build-team Robot [Fri, 13 Apr 2018 22:47:27 +0000 (22:47 +0000)]

Merge cherrypicks of [3898937, 3898958, 3899077, 3897885, 3898496, 3898245, 3898959, 3898960, 3897790, 3898312, 3898313, 3898314, 3899155, 3899156, 3899157, 3898289, 3898290, 3899061, 3898291, 3898292, 3896951, 3899158, 3898961, 3898938, 3898246] into sparse-4657601-L30800000163316240

Change-Id: I7fb38efbc6add86c8877cb20e040e7adf87dacf6

commit | commitdiff | tree

Chong Zhang [Tue, 20 Mar 2018 20:37:22 +0000 (13:37 -0700)]

fix crash due to no output format available -- DO NOT MERGE

Output format should arrive before we get first frame, but if
it doesn't, better fail it than crash.

bug: 69924594
bug: 75978033
Change-Id: I057ba49c8f83b9a301d409510717039ad894c391
(cherry picked from commit 6cb243cd2bb4d2fb41d12394fe5731ba098fc2ef)

commit | commitdiff | tree

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)

commit | commitdiff | tree

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)

Change-Id: I813d2ecd3bc972fb92809f1068f596970591cf3c

commit | commitdiff | tree

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)

commit | commitdiff | tree

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)

commit | commitdiff | tree

android-build-team Robot [Thu, 15 Mar 2018 16:59:37 +0000 (16:59 +0000)]

Snap for 4603989 from 87d12ea5e997a12c9edd5139082aec0feacacb27 to oc-m2-release

Change-Id: I3b178a779a03034cb0b2863d64134524bfc2b412

commit | commitdiff | tree

android-build-team Robot [Wed, 14 Feb 2018 17:18:19 +0000 (17:18 +0000)]

Merge cherrypicks of [3614756, 3614757, 3614861, 3614758, 3614759, 3615200, 3615201, 3615202, 3615203, 3615204, 3614670, 3614671, 3615108, 3615109] into oc-mr1-release

Change-Id: I6a648f5e33bb4046978e2724cbc2da045247774f

commit | commitdiff | tree

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)

commit | commitdiff | tree

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)

commit | commitdiff | tree

android-build-team Robot [Thu, 8 Feb 2018 04:16:49 +0000 (04:16 +0000)]

Merge cherrypicks of [3581037, 3581038, 3580473, 3580624, 3580656, 3580657, 3580658, 3580382, 3580474, 3580475, 3581039, 3581040, 3580476, 3580206, 3581527, 3580955, 3580956, 3580957, 3580958, 3580959, 3580960, 3580961, 3580962, 3580963, 3580964, 3580965, 3580966, 3581567, 3581568, 3581569, 3581570, 3581571, 3580625, 3580626, 3581587, 3581513, 3581514, 3581515, 3580477, 3581588, 3580659, 3580660, 3580383, 3580384, 3580478, 3580719, 3580479, 3580480, 3581385, 3581528, 3581041, 3581042, 3581043, 3581044, 3581045, 3581046, 3581607, 3580385, 3580481, 3580482, 3580483, 3580661, 3580662, 3580663, 3580664, 3580665, 3580484, 3580485, 3581608, 3581609, 3581610, 3581611, 3581612, 3581589, 3581613, 3580486, 3581519, 3581627, 3581628, 3581529, 3581530, 3581531, 3581629, 3581630] into oc-mr1-release

Change-Id: I04f3b4a89e01913b77321b06b7605be6eb35532b

commit | commitdiff | tree

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)

commit | commitdiff | tree

Santhosh Behara [Mon, 16 Oct 2017 11:53:54 +0000 (17:23 +0530)]

libmedia: Fix null pointer crash in secure buffer allocation.

Add null pointer check for native_handle as it is null if
secure memory allocation fails.

Author: Vasantha Balla<vballa@codeaurora.org>

Test: fix the bug
Bug: 71053053
Merged-In: I204ca69b9808448788c83a1ae5a642618eca8973
Change-Id: I204ca69b9808448788c83a1ae5a642618eca8973
(cherry picked from commit fad26c14c7e68c3fe40bda8fd5692b8dbfac1000)
(cherry picked from commit ddd508e96da76a3e2de3d8dfef16e4d0d07fbf9b)

commit | commitdiff | tree

android-build-team Robot [Thu, 18 Jan 2018 22:44:57 +0000 (22:44 +0000)]

Merge cherrypicks of [3478238, 3478653, 3478239, 3478580, 3478612, 3478240, 3478654, 3478655, 3478656, 3479494, 3479495, 3478933, 3478934, 3479496, 3479497, 3479498, 3478160, 3478161, 3478162, 3478876, 3478877, 3478878, 3478241, 3478163, 3478164, 3478165, 3478166, 3478167, 3478168, 3478169, 3479990, 3479991, 3479992, 3480010, 3480011, 3480012] into oc-m2-release

Change-Id: I227f784a6fe35ba1a507ef003a13560a5cf13700

commit | commitdiff | tree

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)

commit | commitdiff | tree

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)

commit | commitdiff | tree

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)

commit | commitdiff | tree

android-build-team Robot [Thu, 18 Jan 2018 19:09:13 +0000 (19:09 +0000)]

Merge cherrypicks of [3478311, 3478390, 3478133, 3478175, 3478391, 3478392, 3478393, 3478134, 3478135, 3478213, 3478214, 3478215, 3478233, 3478234, 3478235, 3478251, 3478252, 3478253, 3478254, 3478394, 3478395, 3478396, 3478397, 3478398, 3478399, 3478400, 3478401, 3478402, 3478403, 3478292, 3478293, 3478312, 3478136, 3477911] into oc-mr1-release

Change-Id: Id70027005744d19b11e7dfe10b6c92b92368e450

commit | commitdiff | tree

Jeff Tinker [Fri, 12 Jan 2018 01:46:16 +0000 (17:46 -0800)]

commit | commitdiff | tree

Robert Shih [Thu, 11 Jan 2018 22:38:23 +0000 (14:38 -0800)]

commit | commitdiff | tree

Jeff Tinker [Thu, 11 Jan 2018 08:14:53 +0000 (00:14 -0800)]

commit | commitdiff | tree

android-build-team Robot [Fri, 5 Jan 2018 18:59:19 +0000 (18:59 +0000)]

Snap for 4527419 from 41c800b90de31114108a985e5d11ba94a45fcd78 to oc-m2-release

Change-Id: Id75f7f95aa8dcd8870d3a4923ebae4bff874822d

commit | commitdiff | tree

android-build-team Robot [Wed, 3 Jan 2018 22:35:46 +0000 (22:35 +0000)]

Snap for 4485699 from 7bb7dfb72a0011f63063879df90ef67dece5c0c9 to oc-m2-release

Change-Id: I27928751484e794b4584ab4ad87068646923ad87

commit | commitdiff | tree

android-build-team Robot [Thu, 14 Dec 2017 21:23:21 +0000 (21:23 +0000)]

Merge cherrypicks of [3365569, 3365570, 3366860, 3366878, 3365571, 3365572, 3366918, 3365573, 3365589, 3365590, 3366938, 3366902, 3365574, 3365575, 3365576, 3365577, 3366958, 3365824, 3365591, 3366959, 3366960, 3366961, 3366962, 3366963, 3366964, 3366965, 3366919, 3366966, 3366967, 3366968, 3366969, 3366970, 3367018, 3367019, 3365592, 3365593, 3366985, 3365825, 3366988, 3366989, 3366990, 3366991, 3366992, 3366993, 3366994, 3367004, 3367005, 3367006, 3367007, 3367008, 3367009, 3367010, 3367011, 3367012, 3367013, 3367014, 3367015, 3367016, 3367017, 3367038, 3367039, 3367040, 3367041, 3367042, 3367044, 3367045, 3367046, 3367049, 3367050, 3367052, 3367053, 3367054, 3367055, 3367056, 3366920, 3366921, 3366922, 3367079] into oc-mr1-release

Change-Id: I7466a52ccba8f87d545545ac8ede0214ae05f50e

commit | commitdiff | tree

Jerry Zhang [Mon, 23 Oct 2017 19:03:40 +0000 (12:03 -0700)]

DO NOT MERGE : Always set sys.usb.ffs.mtp.ready during configure

Sometimes, due to a race, the configure
will fail even though descriptors are actually
written because MtpServer did not die properly.
MtpServer lifetime is fixed properly in master
with multiplexed io, but to work around the
issue here, we set the property at all times.

Also reduce the timeout to leave room for
UsbDeviceManager.

Bug: 67844294
Test: Plug/replug device on sled with usb debugging off x50
Test: Verify that the race is hit, but projection still starts
Test: Verify that all other usb configurations still work
Change-Id: I39dd4d3db95e087f065d58ba80ca980559920c99
(cherry picked from commit 9dc10038b05cc59457ba0a10d90a3b3faddd34c3)

commit | commitdiff | tree

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)

commit | commitdiff | tree

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)

commit | commitdiff | tree

Chien-Yu Chen [Mon, 23 Oct 2017 22:59:49 +0000 (15:59 -0700)]

camera: Drop pending preview for enableZsl shots

If the device support ZSL, drop pending preview buffers to reduce
the chance the rendering preview frames newer than the still frame
during takePicture().

Test: CTS
Bug: 67497723
Change-Id: I5f253a402a6302d31777ad4ca2878ef0d0d1ae44
Merged-In: I5f253a402a6302d31777ad4ca2878ef0d0d1ae44
(cherry picked from commit 63068520622543b57c8607612a4f44fbbef6a021)

commit | commitdiff | tree

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)

commit | commitdiff | tree

android-build-team Robot [Tue, 28 Nov 2017 03:34:29 +0000 (03:34 +0000)]

Merge cherrypicks of [3276508, 3277765, 3277766, 3277904, 3276473, 3278009, 3278010, 3277767, 3277768, 3277769, 3277770, 3276509, 3276510, 3278011, 3278012, 3278013, 3278014, 3278099, 3278100, 3278101, 3278102, 3278103, 3278104, 3278105, 3278106, 3277800, 3276474, 3278015, 3278016, 3278017, 3278118, 3278119, 3278120, 3278121, 3278122, 3277946, 3277905, 3277947, 3277906, 3277751, 3278123, 3277752, 3278110, 3277771, 3277907, 3278095, 3277908, 3278111, 3277772, 3276475, 3276476] into oc-mr1-release

Change-Id: I086dbaeb2bd57353678a0c5ccde32cf0881051b3

commit | commitdiff | tree

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)

commit | commitdiff | tree

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)

commit | commitdiff | tree

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)

commit | commitdiff | tree

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)

commit | commitdiff | tree

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)

commit | commitdiff | tree

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)

commit | commitdiff | tree

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)

commit | commitdiff | tree

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)

commit | commitdiff | tree

android-build-team Robot [Thu, 9 Nov 2017 21:39:42 +0000 (21:39 +0000)]

Snap for 4442250 from 1648c8d1519adeaccc5ee7d31eccc9fcfb9a07be to oc-m2-release

Change-Id: Iad6f44973fd55758650c54e92d11be9c8ec7c73c

commit | commitdiff | tree

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

commit | commitdiff | tree

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)

commit | commitdiff | tree

android-build-team Robot [Fri, 3 Nov 2017 22:43:26 +0000 (22:43 +0000)]

Snap for 4431872 from 18d2294a4cd46cc285a95436c503b46184217451 to oc-m2-release

Change-Id: I087b1ab329d21621c28397ab98bb5f8c8e30f4b1

commit | commitdiff | tree

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

commit | commitdiff | tree

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)

commit | commitdiff | tree

android-build-team Robot [Thu, 26 Oct 2017 20:09:28 +0000 (20:09 +0000)]

Snap for 4417144 from 02151bca26d22b6e9d1f7f6acba6f05042758da2 to oc-m2-release

Change-Id: I12c3384feae3ae3721a96bee30bf9377bcb9e8e4

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Eric Laurent [Thu, 19 Oct 2017 23:03:25 +0000 (23:03 +0000)]

commit | commitdiff | tree

Eric Laurent [Thu, 19 Oct 2017 23:02:27 +0000 (23:02 +0000)]

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Marco Nelissen [Thu, 19 Oct 2017 22:50:51 +0000 (22:50 +0000)]

Fix build am: 48caffe6fe am: 1da4542abd -s ours am: ab486b087e
am: 04b334a98d

Change-Id: I29a12e5b361dd4f145daf2eef98bc59adb0f91b9

commit | commitdiff | tree

Lajos Molnar [Thu, 19 Oct 2017 22:47:11 +0000 (22:47 +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

Change-Id: Ib21d56a7d64fbce2c5d2d55378b1eb7e5cb6f4c9

commit | commitdiff | tree

Eric Laurent [Thu, 19 Oct 2017 22:46:18 +0000 (22:46 +0000)]

commit | commitdiff | tree

Eric Laurent [Thu, 19 Oct 2017 22:44:58 +0000 (22:44 +0000)]

commit | commitdiff | tree

Marco Nelissen [Thu, 19 Oct 2017 22:42:53 +0000 (22:42 +0000)]

Fix build am: 48caffe6fe am: 1da4542abd -s ours
am: ab486b087e

Change-Id: Ib644bc77055c492207ae0fb09c84122fea713719

frameworks/av

RSS Atom

About OSDN

Find Software

Develop Software

Help