frameworks_av.git - frameworks/av

	Commit message (Expand)	Author	Age	Files	Lines
*	am 5bcdfac9: am 2a6e5cf4: Merge "Fix uninitialized variable."	Marco Nelissen	2015-01-29	1	-1/+3
\|\
\| *	Merge "Fix uninitialized variable."	Marco Nelissen	2015-01-29	1	-1/+3
\| \|\
\| \| *	Fix uninitialized variable.	Marco Nelissen	2015-01-29	1	-1/+3
* \| \|	am a3c9d5c3: am 166776fb: Merge "Add missing includes."	Elliott Hughes	2015-01-29	1	-0/+1
\|\ \ \ \| \|/ /
\| * \|	Add missing includes.	Elliott Hughes	2015-01-28	1	-0/+1
\| \|/
* \|	Add missing AudioPolicy.cpp to Android.mk	Brian Carlstrom	2015-01-27	1	-1/+2
* \|	resolved conflicts for merge of b955b722 to lmp-mr1-dev-plus-aosp	Marco Nelissen	2015-01-27	6	-1253/+1
\|\ \ \| \|/
\| *	Remove MediaPlayerService::decode()	Marco Nelissen	2015-01-26	6	-1251/+0
* \|	am cec272df: am 724b9ea5: Merge "Replace MidiFile player with a Midi extractor"	Marco Nelissen	2015-01-13	1	-0/+14
\|\ \ \| \|/
\| *	Replace MidiFile player with a Midi extractor	Marco Nelissen	2015-01-08	1	-0/+14
* \|	resolved conflicts for merge of 2702d5a0 to lmp-mr1-dev-plus-aosp	Marco Nelissen	2015-01-08	3	-21/+82
\|\ \ \| \|/
\| *	Use callbacks for Midi I/O	Marco Nelissen	2015-01-08	3	-21/+82
* \|	am fb5d35c0: am 7ae3dfab: Merge "fix record from default input source" into l...	Eric Laurent	2015-01-07	1	-4/+0
\|\ \
\| * \|	fix record from default input source	Eric Laurent	2015-01-06	1	-4/+0
* \| \|	am bef17542: am 5c97c4e1: Merge "Remove hardcoded ICU & OpenSSL include paths."	Narayan Kamath	2015-01-05	1	-2/+0
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Remove hardcoded ICU & OpenSSL include paths.	Narayan Kamath	2015-01-05	1	-2/+0
* \| \|	am 0b87c0d9: am bd08223c: Merge "Fix double close."	Marco Nelissen	2014-12-22	1	-0/+1
\|\ \ \ \| \|/ /
\| * \|	Merge "Fix double close."	Marco Nelissen	2014-12-22	1	-0/+1
\| \|\ \
\| \| * \|	Fix double close.	Bao Haojun	2014-05-17	1	-0/+1
\| * \| \|	Merge "Prevent ANR when AudioTrack is paused or re-routed"	Glenn Kasten	2014-12-09	1	-0/+2
\| \|\ \ \
\| \| * \| \|	Prevent ANR when AudioTrack is paused or re-routed	zunkyu.lee	2014-12-08	1	-0/+2
* \| \| \| \|	am d33712d7: am 145cf5d8: Merge "audioflinger: implement pause/resume for dir...	Eric Laurent	2014-12-17	1	-0/+5
\|\ \ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \|
\| * \| \| \|	audioflinger: implement pause/resume for direct outputs	Eric Laurent	2014-12-16	1	-0/+5
* \| \| \| \|	Merge commit 'f5a968a0' into mm	Glenn Kasten	2014-12-10	2	-1/+59
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	audio policy: binder calls for dynamic audio policy mixes	Eric Laurent	2014-12-09	2	-1/+59
* \| \| \| \|	am c49d9cda: am 2dda40d6: Merge "audio policy: add support for custom mixes" ...	Eric Laurent	2014-12-10	3	-1/+125
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	audio policy: add support for custom mixes	Eric Laurent	2014-12-09	3	-1/+125
* \| \| \| \|	am c1b0d49c: am 82a69ea8: Prevent ANR when AudioTrack is paused or re-routed	zunkyu.lee	2014-12-09	1	-0/+2
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Prevent ANR when AudioTrack is paused or re-routed	zunkyu.lee	2014-12-08	1	-0/+2
\| * \| \| \|	Track volume should be maintained even if track is restored	seunghak.han	2014-12-05	1	-1/+5
* \| \| \| \|	am bde85d05: am 5458756a: Merge "Track volume should be maintained even if tr...	Glenn Kasten	2014-12-02	1	-1/+5
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	Track volume should be maintained even if track is restored	seunghak.han	2014-12-01	1	-1/+5
\| \| \|/ / \| \|/\| \|
* \| \| \|	am 390ef843: am f20c4356: Merge "AudioRecord: use audio attributes instead of...	Eric Laurent	2014-11-27	4	-39/+75
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	AudioRecord: use audio attributes instead of audio source.	Eric Laurent	2014-11-25	4	-39/+75
* \| \| \|	am bf14c62e: am 72bf901c: Merge "audio policy: new getOutputForAttr() prototy...	Eric Laurent	2014-11-26	4	-223/+128
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge "audio policy: new getOutputForAttr() prototype." into lmp-mr1-dev	Eric Laurent	2014-11-26	4	-223/+128
\| \|\ \ \
\| \| * \| \|	audio policy: new getOutputForAttr() prototype.	Eric Laurent	2014-11-25	4	-223/+128
* \| \| \| \|	am 1e18795a: am d325005e: Merge "Fix AudioTrack loop mode to play audio from ...	Andy Hung	2014-11-26	2	-4/+9
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Merge "Fix AudioTrack loop mode to play audio from buffer start" into lmp-mr1...	Andy Hung	2014-11-25	2	-4/+9
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \|
\| \| * \| \|	Fix AudioTrack loop mode to play audio from buffer start	Andy Hung	2014-11-24	2	-4/+9
* \| \| \| \|	am 1a475921: am 223fd5c9: audio: new routing strategies and stream types	Eric Laurent	2014-11-26	1	-1/+1
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	audio: new routing strategies and stream types	Eric Laurent	2014-11-21	1	-1/+1
\| \|/ / /
* \| \| \|	am f8c2d166: am a7cf01da: Merge "Fix missing loop count for static tracks." i...	Glenn Kasten	2014-11-21	1	-22/+38
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge "Fix missing loop count for static tracks." into lmp-mr1-dev	Glenn Kasten	2014-11-20	1	-22/+38
\| \|\ \ \
\| \| * \| \|	Fix missing loop count for static tracks.	Andy Hung	2014-11-18	1	-22/+38
* \| \| \| \|	am 568689b1: am 3a2a32b5: Merge "AudioSystem: fix cross deadlock" into lmp-mr...	Eric Laurent	2014-11-21	1	-43/+58
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	AudioSystem: fix cross deadlock	Eric Laurent	2014-11-20	1	-43/+58
* \| \| \| \|	am cd370c79: am de14fae7: Merge "Use standard syntax to initialize fields."	Glenn Kasten	2014-11-19	1	-712/+712
\|\ \ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|
\| * \| \| \|	Merge "Use standard syntax to initialize fields."	Glenn Kasten	2014-11-19	1	-712/+712
\| \|\ \ \ \
\| \| * \| \| \|	Use standard syntax to initialize fields.	Chih-Hung Hsieh	2014-11-14	1	-712/+712