frameworks_av.git - frameworks/av

	Commit message (Collapse)	Author	Age	Files	Lines
*	am f106f9e4: am 15e991bd: resolved conflicts for 0b09da7a to lmp-mr1-dev	Wei Jia	2015-10-08	6	-0/+25
\|\ \| \| \| \| \| \| \| \|	* commit 'f106f9e4eacc1cb10ccc851a37619ed4b37bbb1b': DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.
\| *	am 15e991bd: resolved conflicts for 0b09da7a to lmp-mr1-dev	Wei Jia	2015-10-08	6	-0/+25
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	* commit '15e991bdf8870c2c9820c2d98e0d30dae2e05a25': DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.
\| \| *	resolved conflicts for 0b09da7a to lmp-mr1-dev	Wei Jia	2015-10-08	6	-0/+25
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: Ib6a1aa4cee00e0449da30ae158d71403d6236487
\| \| \| *	am 04c02eeb: Merge "DO NOT MERGE - OMX: allow only secure codec to remotely ↵	Wei Jia	2015-10-08	6	-3/+28
\| \| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	call allocateBuffer." into lmp-dev * commit '04c02eeb0e5e5e4829df6946b275a770a8443330': DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.
\| \| \| \| *	Merge "DO NOT MERGE - OMX: allow only secure codec to remotely call ↵	Wei Jia	2015-10-08	6	-3/+28
\| \| \| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	allocateBuffer." into lmp-dev
\| \| \| \| \| *	DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.	Wei Jia	2015-10-07	6	-3/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bug: 24310423 Change-Id: Iebcfc58b447f925ec2134898060af2ef227266a3 (cherry picked from commit 8dde7269a5356503d2b283234b6cb46d0c3f214e)
* \| \| \| \| \|	am d4df7559: am 39f64a1e: am 8b713f11: am b75a78db: am fc0e2a87: am ↵	Wei Jia	2015-10-06	1	-2/+19
\|\ \ \ \ \ \ \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	7ed8d1ef: ID3: check possible integer overflow for extendedHeaderSize and paddingSize. * commit 'd4df7559c32d95707d2c04cbf8612db37d682ef6': ID3: check possible integer overflow for extendedHeaderSize and paddingSize.
\| * \| \| \| \|	am 39f64a1e: am 8b713f11: am b75a78db: am fc0e2a87: am 7ed8d1ef: ID3: check ↵	Wei Jia	2015-10-06	1	-2/+19
\| \|\ \ \ \ \ \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	possible integer overflow for extendedHeaderSize and paddingSize. * commit '39f64a1e4903624bd6395aa2a1c6875a10ed489d': ID3: check possible integer overflow for extendedHeaderSize and paddingSize.
\| \| * \| \| \|	am 8b713f11: am b75a78db: am fc0e2a87: am 7ed8d1ef: ID3: check possible ↵	Wei Jia	2015-10-06	1	-2/+19
\| \| \|\ \ \ \ \| \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	integer overflow for extendedHeaderSize and paddingSize. * commit '8b713f11afc2cd5bf4252022c84bb480a8dd492b': ID3: check possible integer overflow for extendedHeaderSize and paddingSize.
\| \| \| * \| \|	am b75a78db: am fc0e2a87: am 7ed8d1ef: ID3: check possible integer overflow ↵	Wei Jia	2015-10-06	1	-2/+19
\| \| \| \|\ \ \ \| \| \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	for extendedHeaderSize and paddingSize. * commit 'b75a78db916a7becf7e1b5ad15c0b4e667ef4661': ID3: check possible integer overflow for extendedHeaderSize and paddingSize.
\| \| \| \| * \|	am fc0e2a87: am 7ed8d1ef: ID3: check possible integer overflow for ↵	Wei Jia	2015-10-06	1	-2/+19
\| \| \| \| \|\ \ \| \| \| \| \| \|/ \| \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	extendedHeaderSize and paddingSize. * commit 'fc0e2a87c17b1f326b5e3302e8f534c143fd5784': ID3: check possible integer overflow for extendedHeaderSize and paddingSize.
\| \| \| \| \| *	am 7ed8d1ef: ID3: check possible integer overflow for extendedHeaderSize and ↵	Wei Jia	2015-10-06	1	-2/+19
\| \| \| \| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	paddingSize. * commit '7ed8d1eff9b292b3c65a875b13a549e29654534b': ID3: check possible integer overflow for extendedHeaderSize and paddingSize.
\| \| \| \| \| \| *	ID3: check possible integer overflow for extendedHeaderSize and paddingSize.	Wei Jia	2015-10-06	1	-2/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bug: 24623447 Change-Id: Ifbc74454d6e28ad7136efe35ab638a07e46398b1 (cherry picked from commit b3694ff5a5bcecd4b6cedca156f6effb55bbf4ca)
* \| \| \| \| \| \|	am 5e92fded: am 64cdd5f2: am f2cf2bd7: am 07395f4c: am 00f5fa82: am ↵	Marco Nelissen	2015-10-06	1	-2/+9
\|\ \ \ \ \ \ \ \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	74d1927e: Merge "Check NAL size before use" into klp-dev * commit '5e92fdede2391b77cff5fe914d748e1023d0ef90': Check NAL size before use
\| * \| \| \| \| \|	am 64cdd5f2: am f2cf2bd7: am 07395f4c: am 00f5fa82: am 74d1927e: Merge ↵	Marco Nelissen	2015-10-06	1	-2/+9
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	"Check NAL size before use" into klp-dev * commit '64cdd5f243ffdb9460ae3d17bd2a732560fc8395': Check NAL size before use
\| \| * \| \| \| \|	am f2cf2bd7: am 07395f4c: am 00f5fa82: am 74d1927e: Merge "Check NAL size ↵	Marco Nelissen	2015-10-06	1	-2/+9
\| \| \|\ \ \ \ \ \| \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	before use" into klp-dev * commit 'f2cf2bd7448734c6881e3bea2b758f2bf9feeed9': Check NAL size before use
\| \| \| * \| \| \|	am 07395f4c: am 00f5fa82: am 74d1927e: Merge "Check NAL size before use" ↵	Marco Nelissen	2015-10-06	1	-2/+9
\| \| \| \|\ \ \ \ \| \| \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into klp-dev * commit '07395f4cd72cf29d1de2864cde42876db4e54411': Check NAL size before use
\| \| \| \| * \| \|	am 00f5fa82: am 74d1927e: Merge "Check NAL size before use" into klp-dev	Marco Nelissen	2015-10-06	1	-2/+9
\| \| \| \| \|\ \ \ \| \| \| \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '00f5fa82d884c0ca41ee08e7a67ab54238109083': Check NAL size before use
\| \| \| \| \| * \|	am 74d1927e: Merge "Check NAL size before use" into klp-dev	Marco Nelissen	2015-10-06	1	-2/+9
\| \| \| \| \| \|\ \ \| \| \| \| \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '74d1927e4122a1748f89ca2ef79406fc06ee94b2': Check NAL size before use
\| \| \| \| \| \| *	Merge "Check NAL size before use" into klp-dev	Marco Nelissen	2015-10-06	1	-2/+9
\| \| \| \| \| \| \|\
\| \| \| \| \| \| \| *	Check NAL size before use	Marco Nelissen	2015-10-06	1	-2/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bug: 24441553 Bug: 24445122 Change-Id: Ib7f025769adbafd5a2cb64fae5562a0a565945c2
* \| \| \| \| \| \| \|	am 3674abc0: am fb0d63df: am 62d89908: am df68d9d5: am 60b25aa0: am ↵	Wei Jia	2015-10-06	1	-0/+6
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	9ab9c85e: Merge "MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData." into klp-dev * commit '3674abc050997e664c3906b8507d9d4b63d52e9d': MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.
\| * \| \| \| \| \| \|	am fb0d63df: am 62d89908: am df68d9d5: am 60b25aa0: am 9ab9c85e: Merge ↵	Wei Jia	2015-10-06	1	-0/+6
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	"MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData." into klp-dev * commit 'fb0d63df2393a5e20cbb16d90ed5c01295a81836': MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.
\| \| * \| \| \| \| \|	am 62d89908: am df68d9d5: am 60b25aa0: am 9ab9c85e: Merge "MPEG4Extractor: ↵	Wei Jia	2015-10-06	1	-0/+6
\| \| \|\ \ \ \ \ \ \| \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ensure buffer size is not less than 8 for LastCommentData." into klp-dev * commit '62d89908f6c7e3da9dac36aa439ceb1c2522b86d': MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.
\| \| \| * \| \| \| \|	am df68d9d5: am 60b25aa0: am 9ab9c85e: Merge "MPEG4Extractor: ensure buffer ↵	Wei Jia	2015-10-06	1	-0/+6
\| \| \| \|\ \ \ \ \ \| \| \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	size is not less than 8 for LastCommentData." into klp-dev * commit 'df68d9d5bf5329bc2f7effb6afa1d3904eaf30d8': MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.
\| \| \| \| * \| \| \|	am 60b25aa0: am 9ab9c85e: Merge "MPEG4Extractor: ensure buffer size is not ↵	Wei Jia	2015-10-06	1	-0/+6
\| \| \| \| \|\ \ \ \ \| \| \| \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	less than 8 for LastCommentData." into klp-dev * commit '60b25aa0c173854593743dd85588c7449baf87c0': MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.
\| \| \| \| \| * \| \|	am 9ab9c85e: Merge "MPEG4Extractor: ensure buffer size is not less than 8 ↵	Wei Jia	2015-10-06	1	-0/+6
\| \| \| \| \| \|\ \ \ \| \| \| \| \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	for LastCommentData." into klp-dev * commit '9ab9c85e39f089f355faa9cd9db6d113dc482e61': MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.
\| \| \| \| \| \| * \|	Merge "MPEG4Extractor: ensure buffer size is not less than 8 for ↵	Wei Jia	2015-10-06	1	-0/+6
\| \| \| \| \| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	LastCommentData." into klp-dev
\| \| \| \| \| \| \| * \|	MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.	Wei Jia	2015-10-06	1	-0/+6
\| \| \| \| \| \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bug: 24346430 Change-Id: I897a724e968841d9160f819d06c0ce22f6d743c4 (cherry picked from commit 5cae16bdce77b0a3ba590b55637f7d55a2f35402)
* \| \| \| \| \| \| \|	am a0c94bc6: am 567ad5c6: am 7ce82583: am 13b6b51e: am f7d1f627: am ↵	Marco Nelissen	2015-10-06	1	-0/+5
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	257b3bc5: Don\'t crash when there\'s no conceal frame * commit 'a0c94bc6582dde27ed31fbb771d7eb758fb9adbe': Don't crash when there's no conceal frame
\| * \| \| \| \| \| \|	am 567ad5c6: am 7ce82583: am 13b6b51e: am f7d1f627: am 257b3bc5: Don\'t ↵	Marco Nelissen	2015-10-06	1	-0/+5
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	crash when there\'s no conceal frame * commit '567ad5c622c5dd809e2fae0cec93a545723a2f86': Don't crash when there's no conceal frame
\| \| * \| \| \| \| \|	am 7ce82583: am 13b6b51e: am f7d1f627: am 257b3bc5: Don\'t crash when ↵	Marco Nelissen	2015-10-06	1	-0/+5
\| \| \|\ \ \ \ \ \ \| \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	there\'s no conceal frame * commit '7ce825833ad65cebfded3f35457925ae9e00124a': Don't crash when there's no conceal frame
\| \| \| * \| \| \| \|	am 13b6b51e: am f7d1f627: am 257b3bc5: Don\'t crash when there\'s no conceal ↵	Marco Nelissen	2015-10-06	1	-0/+5
\| \| \| \|\ \ \ \ \ \| \| \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	frame * commit '13b6b51e6d9c399f0bfa55be4eecaf47b63845f2': Don't crash when there's no conceal frame
\| \| \| \| * \| \| \|	am f7d1f627: am 257b3bc5: Don\'t crash when there\'s no conceal frame	Marco Nelissen	2015-10-06	1	-0/+5
\| \| \| \| \|\ \ \ \ \| \| \| \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'f7d1f627b0b1139f82f16baee482476cc10ccde4': Don't crash when there's no conceal frame
\| \| \| \| \| * \| \|	am 257b3bc5: Don\'t crash when there\'s no conceal frame	Marco Nelissen	2015-10-06	1	-0/+5
\| \| \| \| \| \|\ \ \ \| \| \| \| \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '257b3bc581bbc65318a4cc2d3c22a07a4429dc1d': Don't crash when there's no conceal frame
\| \| \| \| \| \| * \|	Don't crash when there's no conceal frame	Marco Nelissen	2015-10-05	1	-0/+5
\| \| \| \| \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bug: 24630158 Change-Id: If042aebebb58c218eb7bbf01dcddbcbd05dca1d6
* \| \| \| \| \| \|	am 4189eb41: am 0e86f9f1: am f888d47c: am 91f5dc8f: am bdaee5ea: (-s ours) ↵	Flanker	2015-09-29	0	-0/+0
\|\ \ \ \ \ \ \ \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am 3737a3fa: DO NOT MERGE stagefright: fix AMessage::FromParcel * commit '4189eb417eca658f7e05eb16cf595ca4b0dc4567': DO NOT MERGE stagefright: fix AMessage::FromParcel
\| * \| \| \| \| \|	am 0e86f9f1: am f888d47c: am 91f5dc8f: am bdaee5ea: (-s ours) am 3737a3fa: ↵	Flanker	2015-09-29	0	-0/+0
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	DO NOT MERGE stagefright: fix AMessage::FromParcel * commit '0e86f9f105521095e081c9628d9ddb777c83f42c': DO NOT MERGE stagefright: fix AMessage::FromParcel
\| \| * \| \| \| \|	am f888d47c: am 91f5dc8f: am bdaee5ea: (-s ours) am 3737a3fa: DO NOT MERGE ↵	Flanker	2015-09-29	0	-0/+0
\| \| \|\ \ \ \ \ \| \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	stagefright: fix AMessage::FromParcel * commit 'f888d47cb2a99cec66f451bab812fc3a3fd9d657': DO NOT MERGE stagefright: fix AMessage::FromParcel
\| \| \| * \| \| \|	am 91f5dc8f: am bdaee5ea: (-s ours) am 3737a3fa: DO NOT MERGE stagefright: ↵	Flanker	2015-09-29	0	-0/+0
\| \| \| \|\ \ \ \ \| \| \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix AMessage::FromParcel * commit '91f5dc8fce9c37239216a01d78d771ef7592baa2': DO NOT MERGE stagefright: fix AMessage::FromParcel
\| \| \| \| * \| \|	am bdaee5ea: (-s ours) am 3737a3fa: DO NOT MERGE stagefright: fix ↵	Flanker	2015-09-29	0	-0/+0
\| \| \| \| \|\ \ \ \| \| \| \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	AMessage::FromParcel * commit 'bdaee5eaa345ee9b1e5ddcb921565c4d127ceb8d': DO NOT MERGE stagefright: fix AMessage::FromParcel
\| \| \| \| \| * \|	am 3737a3fa: DO NOT MERGE stagefright: fix AMessage::FromParcel	Flanker	2015-09-29	1	-3/+22
\| \| \| \| \| \|\ \ \| \| \| \| \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '3737a3fa121796131ea5b782230e65dad9ccf90f': DO NOT MERGE stagefright: fix AMessage::FromParcel
\| \| \| \| \| \| *	DO NOT MERGE stagefright: fix AMessage::FromParcel	Flanker	2015-09-25	1	-3/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add check for incoming mNumItems. Also add check readCString return value. Fix style & add log. Bug: 24123723 Change-Id: If41a5312c27d868f481893eef56019b6807c39b7
* \| \| \| \| \| \|	am 99214848: am 5226d6b7: am e64d4870: am 2b8cd9cb: stagefright: fix ↵	Flanker	2015-09-29	1	-3/+25
\|\ \ \ \ \ \ \ \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	AMessage::FromParcel * commit '992148484a286dab886dd4d1b58dabacf1c1920f': stagefright: fix AMessage::FromParcel
\| * \| \| \| \| \|	am 5226d6b7: am e64d4870: am 2b8cd9cb: stagefright: fix AMessage::FromParcel	Flanker	2015-09-29	1	-3/+25
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '5226d6b7b0fbe40ed1450f6a9d2567aa513e8d79': stagefright: fix AMessage::FromParcel
\| \| * \| \| \| \|	am e64d4870: am 2b8cd9cb: stagefright: fix AMessage::FromParcel	Flanker	2015-09-29	1	-3/+25
\| \| \|\ \ \ \ \ \| \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'e64d4870a543803d8172b80ad8eb198dfde6f361': stagefright: fix AMessage::FromParcel
\| \| \| * \| \| \|	am 2b8cd9cb: stagefright: fix AMessage::FromParcel	Flanker	2015-09-29	1	-3/+25
\| \| \| \|\ \ \ \ \| \| \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '2b8cd9cbb3e72ffd048ffdd1609fac74f61a22ac': stagefright: fix AMessage::FromParcel
\| \| \| \| * \| \|	stagefright: fix AMessage::FromParcel	Flanker	2015-09-25	1	-3/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add check for incoming mNumItems. Also add check readCString return value. Fix style & add log. Bug: 24123723 Change-Id: If41a5312c27d868f481893eef56019b6807c39b7
* \| \| \| \| \| \|	DO NOT MERGE - Fix build for commit 69ae6a87	Andy Hung	2015-09-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	test app on lmp-mr1-ub-dev but not on lmp-mr1-dev now needs liblog. Change-Id: Ia995d9101e85f6a68c85d3156fd6b78fa96c87e0
* \| \| \| \| \| \|	am 9b9612fb: am 92504274: am 7e1d645f: am a8f90d57: Merge "IAudioFlinger: ↵	Wei Jia	2015-09-21	1	-1/+1
\|\ \ \ \ \ \ \ \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix the missing initialization of variable to ensure no info leak when writing them to Parcel." into lmp-dev * commit '9b9612fbea5b73779d128cef45b4c08446bf6341': IAudioFlinger: fix the missing initialization of variable to ensure no info leak when writing them to Parcel.