frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge "Add playback state and metadata to dump"	RoboErik	2014-05-02	2	-0/+23
\|\
\| *	Add playback state and metadata to dump	RoboErik	2014-05-01	2	-0/+23
* \|	Merge "MediaHTTPConnection: support header android-allow-cross-domain-redirect"	Lajos Molnar	2014-05-02	1	-12/+97
\|\ \ \| \|/ \|/\|
\| *	MediaHTTPConnection: support header android-allow-cross-domain-redirect	Lajos Molnar	2014-04-29	1	-12/+97
* \|	Fix sdk build	RoboErik	2014-05-01	1	-2/+1
* \|	Merge "Bounds Check in onPlaySoundEffect"	Natalie Silvanovich	2014-05-01	1	-0/+5
\|\ \
\| * \|	Bounds Check in onPlaySoundEffect	Natalie Silvanovich	2014-05-01	1	-0/+5
* \| \|	Merge "Add Session API calls to RCC and AudioManager"	RoboErik	2014-05-01	7	-73/+598
\|\ \ \
\| * \| \|	Add Session API calls to RCC and AudioManager	RoboErik	2014-05-01	7	-73/+598
* \| \| \|	Merge "Add dump to MediaSessionService"	RoboErik	2014-05-01	2	-0/+18
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|
\| * \| \|	Add dump to MediaSessionService	RoboErik	2014-04-29	2	-0/+18
\| \|/ /
* \| \|	am 4375e848: am ab962b54: am ab3977d2: Merge "MetadataRetriever: Check null p...	Marco Nelissen	2014-05-01	1	-0/+7
\|\ \ \
\| * \ \	am ab962b54: am ab3977d2: Merge "MetadataRetriever: Check null pointer to avo...	Marco Nelissen	2014-05-01	1	-0/+7
\| \|\ \ \
\| \| * \ \	am ab3977d2: Merge "MetadataRetriever: Check null pointer to avoid tombstone ...	Marco Nelissen	2014-05-01	1	-0/+7
\| \| \|\ \ \
\| \| \| * \ \	Merge "MetadataRetriever: Check null pointer to avoid tombstone crash."	Marco Nelissen	2014-05-01	1	-0/+7
\| \| \| \|\ \ \
\| \| \| \| * \| \|	MetadataRetriever: Check null pointer to avoid tombstone crash.	wang, biao	2014-04-09	1	-0/+7
* \| \| \| \| \| \|	Merge "Fix MediaFocusControl index management for PlayerRecord"	Jean-Michel Trivi	2014-04-30	1	-7/+13
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Fix MediaFocusControl index management for PlayerRecord	Jean-Michel Trivi	2014-04-30	1	-7/+13
* \| \| \| \| \| \| \|	am 21ccb07f: am 414d9405: am 56cd8dbf: Merge "Cast CallVoidMethod\'s size_t p...	Narayan Kamath	2014-04-30	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| / \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	am 414d9405: am 56cd8dbf: Merge "Cast CallVoidMethod\'s size_t parameters to ...	Narayan Kamath	2014-04-30	1	-1/+1
\| \|\ \ \ \ \ \ \| \| \| \|/ / / / \| \| \|/\| \| \| \|
\| \| * \| \| \| \|	am 56cd8dbf: Merge "Cast CallVoidMethod\'s size_t parameters to jint"	Narayan Kamath	2014-04-30	1	-1/+1
\| \| \|\ \ \ \ \ \| \| \| \| \|/ / / \| \| \| \|/\| \| \|
\| \| \| * \| \| \|	Merge "Cast CallVoidMethod's size_t parameters to jint"	Narayan Kamath	2014-04-30	1	-1/+1
\| \| \| \|\ \ \ \
\| \| \| \| * \| \| \|	Cast CallVoidMethod's size_t parameters to jint	Ashok Bhat	2014-03-06	1	-1/+1
\| \| * \| \| \| \| \|	Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEAD	Bill Yi	2014-04-29	9	-72/+131
\| \| \|\ \ \ \ \ \ \| \| \| \|/ / / / / \| \| \|/\| \| \| \| \|
\| \| \| * \| \| \| \|	am a3dc076d: am bfc44092: Merge "mediaeditor shouldn\'t depend on audioflinger."	Glenn Kasten	2014-03-19	1	-1/+0
\| \| \| \|\ \ \ \ \
\| \| \| * \ \ \ \ \	am 0dc08486: am f7b33e86: Merge "MediaPlayer: fix int overflow issue in Media...	Lajos Molnar	2014-03-19	1	-1/+1
\| \| \| \|\ \ \ \ \ \
\| \| \| * \ \ \ \ \ \	am 105c4792: am 10a07a04: Merge "Verify certificates" into klp-dev	Marco Nelissen	2014-03-14	2	-0/+46
\| \| \| \|\ \ \ \ \ \ \
\| \| \| * \ \ \ \ \ \ \	am bdd4c31a: am 60d7c995: Merge "DO NOT MERGE setAvrcpAbsoluteVolume is passe...	Zhihai Xu	2014-03-14	1	-1/+1
\| \| \| \|\ \ \ \ \ \ \ \
\| \| \| * \ \ \ \ \ \ \ \	am 51ec4ec5: am 5de03b18: Merge "Don\'t assume that size_t is 32-bit"	Narayan Kamath	2014-03-11	1	-3/+3
\| \| \| \|\ \ \ \ \ \ \ \ \
\| \| \| * \ \ \ \ \ \ \ \ \	am 6ac6263d: am 28ccb4f7: Merge "Don\'t use size_t for variables that store u...	Narayan Kamath	2014-03-11	1	-3/+3
\| \| \| \|\ \ \ \ \ \ \ \ \ \
\| \| \| * \ \ \ \ \ \ \ \ \ \	am ac875878: am 9823a170: Merge "Make MtpDatabase use libexif instead of libj...	Marco Nelissen	2014-03-08	2	-34/+46
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \
\| \| \| * \ \ \ \ \ \ \ \ \ \ \	am 233e7e9f: am 98a6bcf4: Merge "ExifInterface: fix class load failure" into ...	Marco Nelissen	2014-03-07	1	-1/+1
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \
\| \| \| * \ \ \ \ \ \ \ \ \ \ \ \	am 4f36104f: am e29c96e7: Merge "libexif is now libjhead" into klp-dev	Marco Nelissen	2014-03-07	1	-2/+2
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \
\| \| \| * \ \ \ \ \ \ \ \ \ \ \ \ \	Merge "resolved conflicts for merge of 8d3281f5 to klp-dev-plus-aosp" into kl...	Leon Scroggins III	2014-03-07	1	-2/+2
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| \| \| * \ \ \ \ \ \ \ \ \ \ \ \ \	resolved conflicts for merge of 8d3281f5 to klp-dev-plus-aosp	Leon Scroggins III	2014-03-06	1	-2/+2
\| \| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| \| * \| \ \ \ \ \ \ \ \ \ \ \ \ \ \	am 860bba68: am 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code"	Narayan Kamath	2014-03-07	1	-2/+2
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \|/ / / / / / / / / / / / / / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| / / / / \| \| \| \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / / / \| \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am 5901ddeb: am 0a1b64fe: Merge "Release locked buffer when it fails to acqui...	Zhijun He	2014-03-07	1	-0/+1
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	am eac19754: am 617e715a: Merge "Fix RemoteController synchronization mode" i...	Eric Laurent	2014-03-06	1	-1/+1
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \| \| \| \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge "Add CHANNEL_OUT_QUAD_SIDE and CHANNEL_OUT_5POINT1_SIDE"	Glenn Kasten	2014-04-29	1	-0/+10
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add CHANNEL_OUT_QUAD_SIDE and CHANNEL_OUT_5POINT1_SIDE	Glenn Kasten	2014-04-15	1	-0/+10
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	resolved conflicts for merge of 3ce4f3d0 to master	Elliott Hughes	2014-04-28	1	-4/+3
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am 685a0a72: am bbd87eb9: Merge "Track libcore.os\' move to android.system."	Elliott Hughes	2014-04-28	1	-4/+3
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Track libcore.os' move to android.system.	Elliott Hughes	2014-04-28	1	-4/+3
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge "ImageReader: remove RAW_SENSOR format translation"	Zhijun He	2014-04-25	1	-7/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ImageReader: remove RAW_SENSOR format translation	Zhijun He	2014-04-24	1	-7/+1
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am ebd6a2d2: am eded9e3b: am adcf38c9: Merge "Release DrmManagerClient resour...	Marco Nelissen	2014-04-25	1	-0/+13
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am eded9e3b: am adcf38c9: Merge "Release DrmManagerClient resources"	Marco Nelissen	2014-04-25	1	-0/+13
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / / / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge "Release DrmManagerClient resources"	Marco Nelissen	2014-04-25	1	-0/+13
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Release DrmManagerClient resources	Mattias Nilsson	2014-04-15	1	-0/+13
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge "camera2: Add DNG creator class."	Ruben Brunk	2014-04-25	1	-0/+254
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|