frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge "More AudioManager tests"	Jean-Michel Trivi	2012-01-24	1	-2/+175
\|\
\| *	More AudioManager tests	Jean-Michel Trivi	2012-01-24	1	-2/+175
* \|	am 10c4641c: am 2ae5805c: am 164a9842: Merge "stagefright aacenc: Properly te...	Jean-Baptiste Queru	2012-01-24	1	-1/+1
\|\ \ \| \|/ \|/\|
\| *	am 164a9842: Merge "stagefright aacenc: Properly terminate a comment"	Jean-Baptiste Queru	2012-01-24	1	-1/+1
\| \|\
\| \| *	Merge "stagefright aacenc: Properly terminate a comment"	Jean-Baptiste Queru	2012-01-24	1	-1/+1
\| \| \|\
\| \| \| *	stagefright aacenc: Properly terminate a comment	Martin Storsjo	2012-01-13	1	-1/+1
\| * \| \|	am 9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT"	Jean-Baptiste Queru	2012-01-19	1	-1/+1
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Rename LOG_ASSERT to ALOG_ASSERT	Steve Block	2012-01-19	1	-1/+1
\| * \| \|	am 6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)"	Jean-Baptiste Queru	2012-01-19	102	-754/+754
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)	Steve Block	2012-01-19	102	-754/+754
\| * \| \|	am a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)"	Jean-Baptiste Queru	2012-01-19	54	-187/+187
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)	Steve Block	2012-01-19	54	-187/+187
\| * \| \|	am 4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)"	Jean-Baptiste Queru	2012-01-19	45	-146/+146
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)	Steve Block	2012-01-19	45	-146/+146
\| * \| \|	am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)"	Jean-Baptiste Queru	2012-01-19	15	-48/+48
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)	Steve Block	2012-01-19	15	-48/+48
\| * \| \|	Merge ee4618bc	Jean-Baptiste Queru	2012-01-19	117	-2100/+2100
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)	Steve Block	2012-01-19	117	-2100/+2100
\| \| \|/
* \| \|	Merge "Fix warning for redundant typedef"	Glenn Kasten	2012-01-20	1	-1/+1
\|\ \ \
\| * \| \|	Fix warning for redundant typedef	Glenn Kasten	2012-01-20	1	-1/+1
* \| \| \|	Use audio_format_t consistently, continued	Glenn Kasten	2012-01-20	4	-30/+30
* \| \| \|	Merge "Starhub RTSP apparently does not establish time on all tracks"	Andreas Huber	2012-01-20	1	-1/+29
\|\ \ \ \
\| * \| \| \|	Starhub RTSP apparently does not establish time on all tracks	Andreas Huber	2012-01-20	1	-1/+29
* \| \| \| \|	Merge "Fix typos in string constants"	Glenn Kasten	2012-01-20	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	Fix typos in string constants	Glenn Kasten	2012-01-19	1	-1/+1
* \| \| \| \| \|	Merge "Remove redundant get()"	Glenn Kasten	2012-01-20	3	-4/+4
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Remove redundant get()	Glenn Kasten	2012-01-20	3	-4/+4
\| \|/ / / / /
* \| \| \| \| \|	Merge "Move memcpy_to_i16_from_u8 to audio_utils"	Glenn Kasten	2012-01-20	1	-13/+5
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \|
\| * \| \| \| \|	Move memcpy_to_i16_from_u8 to audio_utils	Glenn Kasten	2012-01-17	1	-13/+5
* \| \| \| \| \|	Merge "Remove dead setRingerMode(mode, mask)"	Glenn Kasten	2012-01-20	3	-27/+1
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \|
\| * \| \| \| \|	Remove dead setRingerMode(mode, mask)	Glenn Kasten	2012-01-18	3	-27/+1
* \| \| \| \| \|	Merge "Don't need to link to libsqlite from media JNI library."	Jeff Brown	2012-01-19	1	-1/+0
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Don't need to link to libsqlite from media JNI library.	Jeff Brown	2012-01-19	1	-1/+0
* \| \| \| \| \| \|	Remove obsolete TODO comments	James Dong	2012-01-19	6	-139/+4
* \| \| \| \| \| \|	Make sure the ThrottledSource reports the proper mime type	Andreas Huber	2012-01-19	1	-0/+5
\| \|_\|_\|/ / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge "Fix incorrect includes of AudioTrack.h"	Glenn Kasten	2012-01-19	4	-4/+2
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fix incorrect includes of AudioTrack.h	Glenn Kasten	2012-01-18	4	-4/+2
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge "Simplify range check for audio_mode_t (continued)"	Glenn Kasten	2012-01-19	1	-0/+1
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Simplify range check for audio_mode_t (continued)	Glenn Kasten	2012-01-18	1	-0/+1
\| \|/ / / /
* \| \| \| \|	Merge "Temporarily restore AudioSystem/AudioTrack APIs with their former sign...	Andreas Huber	2012-01-18	2	-0/+29
\|\ \ \ \ \
\| * \| \| \| \|	Temporarily restore AudioSystem/AudioTrack APIs with their former signatures	Andreas Huber	2012-01-18	2	-0/+29
\| \|/ / / /
* \| \| \| \|	Merge "AVIExtractor: adding a H264 fourCC which is also specified in the refe...	Andreas Huber	2012-01-18	1	-0/+1
\|\ \ \ \ \
\| * \| \| \| \|	AVIExtractor: adding a H264 fourCC which is also specified in the reference.	Dongwon Kang	2012-01-15	1	-0/+1
* \| \| \| \| \|	Merge "Make sure seek triggers a reconnect if needed."	Bryan Mawhinney	2012-01-18	1	-2/+3
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Make sure seek triggers a reconnect if needed.	Bryan Mawhinney	2012-01-18	1	-2/+3
* \| \| \| \| \|	Merge "Track volume cleanup"	Glenn Kasten	2012-01-18	1	-1/+0
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Track volume cleanup	Glenn Kasten	2012-01-17	1	-1/+0
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge "audio framework: manage stream volume per device"	Eric Laurent	2012-01-17	4	-127/+363
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	audio framework: manage stream volume per device	Eric Laurent	2012-01-17	4	-127/+363
* \| \| \| \|	Move fixed_fft to system/media/audio_utils	Glenn Kasten	2012-01-17	3	-168/+5