frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge "Remove calls to deprecated SkBitmap::setIsOpaque()"	Leon Scroggins III	2014-01-15	1	-2/+2
\|\
\| *	Remove calls to deprecated SkBitmap::setIsOpaque()	Leon Scroggins III	2014-01-15	1	-2/+2
* \|	Merge "Unhide android.media.AudioTrack.setVolume(float)"	Glenn Kasten	2014-01-15	1	-2/+6
\|\ \ \| \|/ \|/\|
\| *	Unhide android.media.AudioTrack.setVolume(float)	Glenn Kasten	2014-01-14	1	-2/+6
* \|	Merge "Use AUDIO_SESSION_ALLOCATE instead of hard-coded 0"	Glenn Kasten	2014-01-15	3	-4/+7
\|\ \
\| * \|	Use AUDIO_SESSION_ALLOCATE instead of hard-coded 0	Glenn Kasten	2013-06-26	3	-4/+7
* \| \|	am 28f032e6: am e2c046fe: am 13249411: am a9045d24: am 337aa376: Merge "Add N...	Marco Nelissen	2014-01-14	1	-8/+11
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	am a9045d24: am 337aa376: Merge "Add NULL check in updateProxyConfig"	Marco Nelissen	2014-01-14	1	-8/+11
\| \|\ \
\| \| * \	Merge "Add NULL check in updateProxyConfig"	Marco Nelissen	2014-01-14	1	-8/+11
\| \| \|\ \
\| \| \| * \|	Add NULL check in updateProxyConfig	Oscar Rydhé	2013-12-19	1	-8/+11
* \| \| \| \|	Merge "Prepare for additional formats beyond 8-bit and 16-bit PCM"	Glenn Kasten	2014-01-13	1	-1/+2
\|\ \ \ \ \
\| * \| \| \| \|	Prepare for additional formats beyond 8-bit and 16-bit PCM	Glenn Kasten	2014-01-10	1	-1/+2
* \| \| \| \| \|	libjhead_jni is still needed	Marco Nelissen	2014-01-13	1	-0/+3
* \| \| \| \| \|	Merge "setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager"	Zhihai Xu	2014-01-11	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager	Zhihai Xu	2014-01-10	1	-1/+1
* \| \| \| \| \| \|	am bb0a4f20: am 1ae17633: am 411350dd: am 739ae9b3: am 868173a5: Merge "Fix a...	Jason Sams	2014-01-11	1	-0/+1
\|\ \ \ \ \ \ \ \| \| \|_\|/ / / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	am 739ae9b3: am 868173a5: Merge "Fix a JNI local reference leak in MediaDrm"	Jason Sams	2014-01-10	1	-0/+1
\| \|\ \ \ \ \ \ \| \| \| \|_\|/ / / \| \| \|/\| \| \| \|
\| \| * \| \| \| \|	Merge "Fix a JNI local reference leak in MediaDrm"	Jason Sams	2014-01-11	1	-0/+1
\| \| \|\ \ \ \ \
\| \| \| * \| \| \| \|	Fix a JNI local reference leak in MediaDrm	Patrik2 Carlsson	2013-12-19	1	-0/+1
\| \| \| \| \|_\|/ / \| \| \| \|/\| \| \|
* \| \| \| \| \| \|	Make MtpDatabase use libexif instead of libjhead	Marco Nelissen	2014-01-10	2	-37/+46
\| \|_\|_\|_\|/ / \|/\| \| \| \| \|
* \| \| \| \| \|	am 1e3395c7: am 105b545e: am 0dce19ca: am 79ceb53a: am c58abeea: Merge "AArch...	Narayan Kamath	2014-01-07	6	-27/+28
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am 79ceb53a: am c58abeea: Merge "AArch64: Use long for pointers in MTP classes"	Narayan Kamath	2014-01-07	6	-27/+28
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	AArch64: Use long for pointers in MTP classes	Ashok Bhat	2014-01-07	6	-27/+28
* \| \| \| \| \|	am 510616d2: am bec733af: am 23ebc24e: am 08467c57: am 9bc6acf2: Merge "AArch...	Narayan Kamath	2014-01-07	3	-37/+37
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am 08467c57: am 9bc6acf2: Merge "AArch64: Use long for pointers in VideoEdito...	Narayan Kamath	2014-01-07	3	-37/+37
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	AArch64: Use long for pointers in VideoEditor classes	Ashok Bhat	2014-01-07	3	-37/+37
* \| \| \| \| \|	am 113e83e6: am 58cb0f0c: am bfbe585e: am c0c92f20: am 357ea905: Merge "AArch...	Narayan Kamath	2014-01-07	4	-57/+65
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am c0c92f20: am 357ea905: Merge "AArch64: Use long for pointers in audio effe...	Narayan Kamath	2014-01-07	4	-57/+65
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	AArch64: Use long for pointers in audio effect classes	Ashok Bhat	2014-01-07	4	-57/+65
* \| \| \| \| \|	am 99aec6b5: am 40b0aaa9: am 568cde55: am 80cff944: am 74675f29: Merge "AArch...	Narayan Kamath	2014-01-07	2	-20/+20
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am 80cff944: am 74675f29: Merge "AArch64: Use long for pointers in AmrInputSt...	Narayan Kamath	2014-01-07	2	-20/+20
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	AArch64: Use long for pointers in AmrInputStream	Ashok Bhat	2014-01-07	2	-20/+20
* \| \| \| \| \|	Merge "Fix RemoteController synchronization mode"	Jean-Michel Trivi	2014-01-06	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fix RemoteController synchronization mode	Jean-Michel Trivi	2014-01-02	1	-1/+1
* \| \| \| \| \| \|	MediaRecorder: add getSurface() api and SURFACE video source	Chong Zhang	2014-01-06	2	-3/+49
\|/ / / / / /
* \| \| \| \| \|	ExifInterface: fix class load failure	Zhijun He	2013-12-20	1	-1/+1
* \| \| \| \| \|	Merge "libexif is now libjhead"	Marco Nelissen	2013-12-19	1	-2/+2
\|\ \ \ \ \ \
\| * \| \| \| \| \|	libexif is now libjhead	Marco Nelissen	2013-12-19	1	-2/+2
* \| \| \| \| \| \|	am ad1ff472: am 7bbc79fd: am 91f6aaaf: am 2d2d5943: am f3172c62: Merge "Media...	Narayan Kamath	2013-12-19	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	am 2d2d5943: am f3172c62: Merge "MediaDrm#mNativeContext is a long, not int."	Narayan Kamath	2013-12-19	1	-1/+1
\| \|\ \ \ \ \ \ \| \| \| \|/ / / / \| \| \|/\| \| \| \|
\| \| * \| \| \| \|	Merge "MediaDrm#mNativeContext is a long, not int."	Narayan Kamath	2013-12-19	1	-1/+1
\| \| \|\ \ \ \ \ \| \| \| \|_\|/ / / \| \| \|/\| \| \| \|
\| \| \| * \| \| \|	MediaDrm#mNativeContext is a long, not int.	Narayan Kamath	2013-12-18	1	-1/+1
* \| \| \| \| \| \|	am 52ba48a8: am f08b83be: am 4dd5c377: am be8fbb8f: Merge "Remove unused fiel...	Narayan Kamath	2013-12-18	2	-9/+0
\|\ \ \ \ \ \ \ \| \|/ / / / / / \| \| \| \| / / / \| \|_\|_\|/ / / \|/\| \| \| \| \|
\| * \| \| \| \|	am be8fbb8f: Merge "Remove unused field from MediaMuxer"	Narayan Kamath	2013-12-18	2	-9/+0
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	Remove unused field from MediaMuxer	Narayan Kamath	2013-12-18	2	-9/+0
\| \| \|/ / /
* \| \| \| \|	am 3bfc6e76: am c0d6028f: am a012fee3: am 5d6332e3: Merge "AArch64: Use long ...	Elliott Hughes	2013-12-16	4	-29/+29
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 5d6332e3: Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer"	Elliott Hughes	2013-12-16	4	-29/+29
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer"	Elliott Hughes	2013-12-16	4	-29/+29
\| \| \|\ \ \
\| \| \| * \| \|	AArch64: Use long for pointers in MediaDrm and MediaMuxer	Ashok Bhat	2013-12-10	4	-29/+29
* \| \| \| \| \|	resolved conflicts for merge of e0b14ea7 to master	Kenny Root	2013-12-13	2	-8/+7
\|\ \ \ \ \ \ \| \|/ / / / /