summaryrefslogtreecommitdiffstats
path: root/media/libmedia
Commit message (Collapse)AuthorAgeFilesLines
* Fix benign unsigned overflow in AuidoTrackSharedChad Brubaker2015-11-051-2/+2
| | | | | | | fsanitize=integer adds unsigned checks to int32_t - uint32_t, force both operands to int32_t to avoid such checks being added. Change-Id: I76fce38f9636f5322ad95fdb81abb690503f4d08
* Refactor setPlaybackRate to avoid benign unsigned integer overflow.Dan Austin2015-11-051-2/+2
| | | | | | | | There is a check that results in a benign unsigned integer overflow. This has been refactored to avoid the unsigned integer overflow. Bug: 25327431 Change-Id: Ib112a7cd585c680f13e4bee3d7e9f45da7d66f1d
* Merge tag 'android-6.0.0_r26' into cm-13.0Ricardo Cerqueira2015-11-053-5/+19
|\ | | | | | | | | | | Android 6.0.0 release 26 Change-Id: I8a57007bf6efcd8b95c3cebf5e0444345bdd4cda
| * Merge "AudioTrack: Prevent stop() from reissuing last marker event" into ↵Glenn Kasten2015-10-071-3/+12
| |\ | | | | | | | | | mnc-dr-dev
| | * AudioTrack: Prevent stop() from reissuing last marker eventAndy Hung2015-10-061-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | Avoid a duplicate marker event race condition (1 in 30 or less) by clearing marker reached in start() not stop(). Bug: 24497521 Change-Id: I9520d063c7d173d2e642174bf60a2bfe75edf085
| * | am cb70fdbe: Merge "OMX: allow only secure codec to remotely call ↵Wei Jia2015-10-061-0/+6
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | allocateBuffer." into mnc-dev * commit 'cb70fdbe9be14002a4303a93f07a13c508c00d89': OMX: allow only secure codec to remotely call allocateBuffer.
| | * | OMX: allow only secure codec to remotely call allocateBuffer.Wei Jia2015-10-021-0/+6
| | |/ | | | | | | | | | | | | Bug: 24310423 Change-Id: Iebcfc58b447f925ec2134898060af2ef227266a3
| * | AudioSystem: Fix race condition in accessing ioDescriptorsPraveen Chavan2015-10-051-4/+10
| |/ | | | | | | | | | | | | | | | | | | | | | | The vector mIoDescriptors can be simultaneouly modified and accessed by 2 threads. Acquire a lock while wrapping the ioDescriptor in a sp<> Bug: 24576810 Author: Haynes Mathew George <hgeorge@codeaurora.org> Change-Id: I73c79ef8eca092b500a7ead3a5ebd0bcf75f9920
| * Merge "DO NOT MERGE Fix vulnerability in mediaserver" into mnc-devJeff Tinker2015-09-171-1/+1
| |\
| | * DO NOT MERGE Fix vulnerability in mediaserverJeff Tinker2015-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | | ICrypto.cpp: ASLR bypass using DECRYPT IPC bug: 24074485 Change-Id: I61cd77f0894140547f666a80526ebfe1ec3d2db6
| * | IAudioFlinger: fix the missing initialization of variable to ensure no info ↵Wei Jia2015-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | | leak when writing them to Parcel. Bug: 23953967 Change-Id: I3a1d0144ba3832649e322c197ff0f03305ee7829
| * | IAudioFlinger: always initialize variables to ensure no info leak when ↵Wei Jia2015-09-102-15/+15
| | | | | | | | | | | | | | | | | | | | | writing them to Parcel. Bug: 23953967 Change-Id: Ibbe841da149038675e9e8daea76c77558bc8564b
| * | IAudioFlinger: clear config before reading it from parcel.Wei Jia2015-09-092-15/+29
| |/ | | | | | | | | | | Bug: 23905951 Bug: 23912202 Change-Id: Id13a9d3cae2c09e7381b841e67ddfb188274d74c
| * am becceb11: am b57ffbb5: am d021f7e5: am b18c0276: am 2b63b91b: am ↵Robert Shih2015-09-042-3/+3
| |\ | | | | | | | | | | | | | | | | | | c1e989e7: am 13ff64c2: Merge "Zero out return values in media binder calls" into klp-dev * commit 'becceb1136e7eb01db7dd865cb98a57117212879': Zero out return values in media binder calls
| | * am b57ffbb5: am d021f7e5: am b18c0276: am 2b63b91b: am c1e989e7: am ↵Robert Shih2015-09-042-3/+3
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | 13ff64c2: Merge "Zero out return values in media binder calls" into klp-dev * commit 'b57ffbb5486a58e0dbb03466e9f3a5e51d6cf0f3': Zero out return values in media binder calls
| | | * am b18c0276: am 2b63b91b: am c1e989e7: am 13ff64c2: Merge "Zero out return ↵Robert Shih2015-09-042-3/+3
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | values in media binder calls" into klp-dev * commit 'b18c02761fe357599f9dad17355e38ec1d3226f2': Zero out return values in media binder calls
| | | | * am c1e989e7: am 13ff64c2: Merge "Zero out return values in media binder ↵Robert Shih2015-09-032-3/+3
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | calls" into klp-dev * commit 'c1e989e76a461ea69e293839b3c29b634a462bd5': Zero out return values in media binder calls
| | | | | * am 13ff64c2: Merge "Zero out return values in media binder calls" into klp-devRobert Shih2015-09-032-3/+3
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '13ff64c2db84f4e7cac3396700e333b48c42c7ee': Zero out return values in media binder calls
| | | | | | * Merge "Zero out return values in media binder calls" into klp-devRobert Shih2015-09-032-3/+3
| | | | | | |\
| | | | | | | * Zero out return values in media binder callsRobert Shih2015-09-022-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More specifically when handling: * GET_STREAM_VOLUME in IAudioPolicyService, and * GET_CURRENT_POSITION and GET_DURATION in IMediaPlayer This prevents leaking uninitialized values across binder in error cases. Bug: 23756261 Change-Id: I0ffd900ab12b685b0611259ade4a3efb1ec5defe
| * | | | | | | am 7734e37e: am a1179678: am be695f0a: am 5e193041: am 52a4fc09: am ↵Andy Hung2015-09-041-7/+20
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3732a3ac: am ab203130: Merge "Make IEffect command more robust (second try)" into klp-dev * commit '7734e37efe4ad47d91cdc5cfa6703d77a7a2ac0c': Make IEffect command more robust (second try)
| | * | | | | | am a1179678: am be695f0a: am 5e193041: am 52a4fc09: am 3732a3ac: am ↵Andy Hung2015-09-041-7/+20
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ab203130: Merge "Make IEffect command more robust (second try)" into klp-dev * commit 'a1179678752e5755297a2bb66c730f4fd22856e3': Make IEffect command more robust (second try)
| | | * | | | | am 5e193041: am 52a4fc09: am 3732a3ac: am ab203130: Merge "Make IEffect ↵Andy Hung2015-09-041-7/+20
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | command more robust (second try)" into klp-dev * commit '5e193041ab8a541b478dd1b61c8c8cd24bca2ab5': Make IEffect command more robust (second try)
| | | | * | | | am 3732a3ac: am ab203130: Merge "Make IEffect command more robust (second ↵Andy Hung2015-09-031-7/+20
| | | | |\ \ \ \ | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | try)" into klp-dev * commit '3732a3acafa7eb621bc26cca3eb00150ea12d2e2': Make IEffect command more robust (second try)
| | | | | * | | am ab203130: Merge "Make IEffect command more robust (second try)" into klp-devAndy Hung2015-09-031-7/+20
| | | | | |\ \ \ | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ab20313074bb109f29f677c3f09d5da1a48c94e7': Make IEffect command more robust (second try)
| | | | | | * | Make IEffect command more robust (second try)Andy Hung2015-09-021-7/+20
| | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23540907 Change-Id: If30cfa535ad51521053706fc40fc98d893db5bc7 (cherry picked from commit 10e6660cc5da65b027c90489ba7ac55d1504e012)
| * | | | | | am 4abb48c3: am 898e8575: am 72b0abdf: Merge "Zero out return values in ↵Robert Shih2015-09-031-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | audio binder calls" into lmp-mr1-dev * commit '4abb48c30cd7821f3397ccd7de8deb3eb645b385': Zero out return values in audio binder calls
| | * | | | | am 898e8575: am 72b0abdf: Merge "Zero out return values in audio binder ↵Robert Shih2015-09-031-1/+1
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | calls" into lmp-mr1-dev * commit '898e857594b738f88be4de5addc8ca296dfabd74': Zero out return values in audio binder calls
| | | * | | | Zero out return values in audio binder callsRobert Shih2015-09-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More specifically when handling GET_OUTPUT_FOR_ATTR in IAudioPolicyService. This prevents leaking a uninitialized `output` across binder if getOutputForAttr were to encounter errors. Bug: 23756261 Change-Id: Ibff8a1249a4e8a3c89a33a540dda428b10d6ca82
| | * | | | | am 6b203f06: am 66b24004: am 0ea9e276: am 184ad88d: am fba72ab0: am ↵Andy Hung2015-08-281-2/+2
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f394f121: Merge "libmedia: clear reply data for IEffect command" into klp-dev * commit '6b203f06b969ba92181dbf781544b40cc2c41b7c': libmedia: clear reply data for IEffect command
| | | * | | | am 0ea9e276: am 184ad88d: am fba72ab0: am f394f121: Merge "libmedia: clear ↵Andy Hung2015-08-281-2/+2
| | | |\ \ \ \ | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reply data for IEffect command" into klp-dev * commit '0ea9e2761a04c4f592d854dbde2749395735fe56': libmedia: clear reply data for IEffect command
| | | | * | | am fba72ab0: am f394f121: Merge "libmedia: clear reply data for IEffect ↵Andy Hung2015-08-281-2/+2
| | | | |\ \ \ | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | command" into klp-dev * commit 'fba72ab0fcf7298492dcd9e3045913435d30d3a9': libmedia: clear reply data for IEffect command
| | | | | * | am f394f121: Merge "libmedia: clear reply data for IEffect command" into klp-devAndy Hung2015-08-281-2/+2
| | | | | |\ \ | | | | | | |/ | | | | | | | | | | | | | | | | | | | | | * commit 'f394f12167fddbc755855d06b615509517c99f14': libmedia: clear reply data for IEffect command
| | | | | | * Merge "libmedia: clear reply data for IEffect command" into klp-devAndy Hung2015-08-281-2/+2
| | | | | | |\
| | | | | | | * libmedia: clear reply data for IEffect commandAndy Hung2015-08-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23540907 Change-Id: Ib89afc6b273b0eb310bbc5a1bd92b1e3d407c249
| * | | | | | | Merge "Fix for security vulnerability in media server" into mnc-devJeff Tinker2015-08-281-1/+19
| |\ \ \ \ \ \ \
| | * | | | | | | Fix for security vulnerability in media serverJeff Tinker2015-08-271-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 23540426 Change-Id: Ifb12ac3350410a49ba7d81d1bde12822c3008cd5
| * | | | | | | | am 608c349d: am 4e861bf5: am e1dc15ec: am 762c7139: am b04cfdf5: am ↵Nick Kralevich2015-08-271-0/+2
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d437c777: am 0981df6e: IMediaPlayer.cpp: make sure structures are initialized to 0 * commit '608c349d611e03e0143c23c3f77ddc62b137e354': IMediaPlayer.cpp: make sure structures are initialized to 0
| | * | | | | | | am 4e861bf5: am e1dc15ec: am 762c7139: am b04cfdf5: am d437c777: am ↵Nick Kralevich2015-08-271-0/+2
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0981df6e: IMediaPlayer.cpp: make sure structures are initialized to 0 * commit '4e861bf5d43eae00ae4cb8727c5a408c3728288b': IMediaPlayer.cpp: make sure structures are initialized to 0
| | | * | | | | | am 762c7139: am b04cfdf5: am d437c777: am 0981df6e: IMediaPlayer.cpp: make ↵Nick Kralevich2015-08-271-0/+2
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sure structures are initialized to 0 * commit '762c713900bd764570c8fda4e238497200da66d6': IMediaPlayer.cpp: make sure structures are initialized to 0
| | | | * | | | | am d437c777: am 0981df6e: IMediaPlayer.cpp: make sure structures are ↵Nick Kralevich2015-08-271-0/+2
| | | | |\ \ \ \ \ | | | | | | |/ / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initialized to 0 * commit 'd437c77716fcf454d99b8424bb01f37643b970cc': IMediaPlayer.cpp: make sure structures are initialized to 0
| | | | | * | | | am 0981df6e: IMediaPlayer.cpp: make sure structures are initialized to 0Nick Kralevich2015-08-271-0/+2
| | | | | |\ \ \ \ | | | | | | | |/ / | | | | | | |/| | | | | | | | | | | | | | | | | | | | * commit '0981df6e3db106bfb7a56a2b668c012fcc34dd2c': IMediaPlayer.cpp: make sure structures are initialized to 0
| | | | | | * | | IMediaPlayer.cpp: make sure structures are initialized to 0Nick Kralevich2015-08-271-0/+2
| | | | | | | |/ | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Credit https://code.google.com/p/android/issues/detail?id=183310 Bug: 23515142 Change-Id: Idbd66fb148bd0ac1dd78f8651d0164f2a41e2427 (cherry picked from commit b73b826cc16291b33649402497efbe0f946413bd)
| | | | | * | | am 8de6d690: Fix build break DO NOT MERGEJeff Tinker2015-08-211-1/+1
| | | | | |\ \ \ | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | * commit '8de6d690ae5843bd8e005deedea571596f79bbd3': Fix build break DO NOT MERGE
| | | | | | * | Fix build break DO NOT MERGEJeff Tinker2015-08-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | related-to-bug: 23223325 Change-Id: I7b09712b5f18912abddd50b75f6edaf860e894c1
| | | | | * | | am c2153d0d: DO NOT MERGE Part of fix for libmedia OOB write anywhereJeff Tinker2015-08-211-3/+3
| | | | | |\ \ \ | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c2153d0dc800d0718788dccd0f2a2d29f4647c03': DO NOT MERGE Part of fix for libmedia OOB write anywhere
| | | | | | * | DO NOT MERGE Part of fix for libmedia OOB write anywhereJeff Tinker2015-08-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify that decrypt destination is not a pointer for secure case. b/23223325 Change-Id: I642dcf790a9eb9e32175f3e0d8f040c82228e3ac (cherry picked from commit ed555d70d80964f40563d89a4e6d6a80f83f4b89)
| | | | | * | | am dbe6c320: HDCP: buffer over flow check -- DO NOT MERGEChong Zhang2015-05-141-2/+24
| | | | | |\ \ \ | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dbe6c320b414d8139c46aaf880d5f154ef4f9af8': HDCP: buffer over flow check -- DO NOT MERGE
| | | | | | * | HDCP: buffer over flow check -- DO NOT MERGEChong Zhang2015-05-141-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 20222489 Change-Id: I3a64a5999d68ea243d187f12ec7717b7f26d93a3 (cherry picked from commit 532cd7b86a5fdc7b9a30a45d8ae2d16ef7660a72)
| | * | | | | | am 0ea1da27: am 5f126c0d: am e93a33a8: am 8cc71bc8: Merge "DO NOT MERGE Part ↵Abhishek Arya2015-08-211-3/+3
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of fix for libmedia OOB write anywhere" into lmp-dev * commit '0ea1da27437575f6b075860fa858a257c806d5ef': DO NOT MERGE Part of fix for libmedia OOB write anywhere
generated by cgit v1.1 at 2024-06-12 13:47:21 +0000