frameworks_av.git - frameworks/av

	Commit message (Expand)	Author	Age	Files	Lines
*	resolved conflicts for merge of 3c780188 to master	Glenn Kasten	2014-03-14	1	-0/+1
\|\
\| *	am 089affb6: Merge "mediaserver and associated services are 32-bit only"	Glenn Kasten	2014-03-14	1	-0/+1
\| \|\
\| \| *	mediaserver and associated services are 32-bit only	Glenn Kasten	2014-03-12	1	-0/+1
\| * \|	am f0fb921c: am bc69c8ba: DO NOT MERGE: Camera: delete preview callback when ...	Zhijun He	2014-03-11	1	-0/+16
\| \|\ \
\| \| * \	am bc69c8ba: DO NOT MERGE: Camera: delete preview callback when preview size ...	Zhijun He	2014-03-11	1	-0/+16
\| \| \|\ \
\| \| \| * \|	DO NOT MERGE: Camera: delete preview callback when preview size is changed	Zhijun He	2014-03-10	1	-0/+16
\| * \| \| \|	am 47ef192f: am a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e into kl...	Eino-Ville Talvala	2014-03-07	3	-55/+66
\| \|\ \ \ \ \| \| \|/ / / \| \| \| \| / \| \| \|_\|/ \| \|/\| \|
\| \| * \|	am a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-dev	Eino-Ville Talvala	2014-03-07	3	-55/+66
\| \| \|\ \ \| \| \| \|/
\| \| \| *	DO NOT MERGE: Camera: fix focusArea wrong indexing issue	Zhijun He	2014-03-05	1	-14/+14
\| \| \| *	DO NOT MERGE: camera2: Fix race with stream deletion during disconnect.	Ruben Brunk	2014-03-05	1	-6/+8
\| \| \| *	DO NOT MERGE: camera2/3: Add protection for still capture path	Zhijun He	2014-03-05	1	-35/+44
* \| \| \|	Merge "camera3: Pass vendor tags through binder."	Ruben Brunk	2014-03-13	5	-49/+111
\|\ \ \ \
\| * \| \| \|	camera3: Pass vendor tags through binder.	Ruben Brunk	2014-03-13	5	-49/+111
* \| \| \| \|	Merge "camera2: Fix race with stream deletion during disconnect."	Ruben Brunk	2014-02-24	1	-6/+8
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	camera2: Fix race with stream deletion during disconnect.	Ruben Brunk	2013-12-05	1	-6/+8
* \| \| \| \|	resolved conflicts for merge of 566be7c3 to master	Narayan Kamath	2014-02-11	8	-13/+15
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	Make frameworks/av 64-bit compatible	Kévin PETIT	2014-02-11	8	-13/+15
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge "FINAL ATTEMPT: HTTP services are now provided from JAVA and made avail...	Andreas Huber	2014-02-05	1	-1/+2
\|\ \ \ \
\| * \| \| \|	FINAL ATTEMPT: HTTP services are now provided from JAVA and made available to...	Andreas Huber	2014-02-04	1	-1/+2
* \| \| \| \|	camera3: Update maxRegions tag.	Ruben Brunk	2014-02-04	2	-9/+38
\|/ / / /
* \| \| \|	Camera: fix focusArea wrong indexing issue	Zhijun He	2014-01-29	1	-14/+14
* \| \| \|	camera3: Delete output stream of bi-directional stream	Zhijun He	2014-01-27	1	-3/+7
* \| \| \|	Merge "Camera: delete preview callback when preview size is changed"	Zhijun He	2014-01-27	1	-0/+16
\|\ \ \ \
\| * \| \| \|	Camera: delete preview callback when preview size is changed	Zhijun He	2014-01-24	1	-0/+16
* \| \| \| \|	Merge "Camera3: Flush device before ZSL reprocess"	Zhijun He	2014-01-27	2	-1/+17
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Camera3: Flush device before ZSL reprocess	Zhijun He	2014-01-23	2	-1/+17
* \| \| \| \|	Merge "Camera: delete zsl stream for video mode"	Zhijun He	2014-01-24	1	-0/+2
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Camera: delete zsl stream for video mode	Zhijun He	2013-11-01	1	-0/+2
* \| \| \| \|	camera3: Update sceneMode tag spec.	Ruben Brunk	2014-01-17	2	-10/+10
* \| \| \| \|	am a2949165: am 3eccdde9: am c7614eb7: Merge "libcameraservice: Fix build in ...	Eino-Ville Talvala	2014-01-15	1	-5/+5
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	Merge "libcameraservice: Fix build in ISO C++11 mode"	Eino-Ville Talvala	2014-01-15	1	-5/+5
\| \|\ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \|
\| \| * \| \|	libcameraservice: Fix build in ISO C++11 mode	Bernhard Rosenkraenzer	2013-07-30	1	-5/+5
* \| \| \| \|	Camera2 API: fix front facing camera flip issue	Zhijun He	2013-12-26	1	-17/+47
\| \|_\|_\|/ \|/\| \| \|
* \| \| \|	camera2/3: Add protection for still capture path	Zhijun He	2013-11-26	1	-35/+44
* \| \| \|	Merge "Camera3: Remove request from InFlightMap for error case"	Zhijun He	2013-11-21	1	-2/+4
\|\ \ \ \
\| * \| \| \|	Camera3: Remove request from InFlightMap for error case	Zhijun He	2013-11-21	1	-2/+4
* \| \| \| \|	Merge "Camera3: add systraces for hal open/close"	Zhijun He	2013-11-19	1	-0/+4
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Camera3: add systraces for hal open/close	Zhijun He	2013-11-19	1	-0/+4
* \| \| \| \|	Merge "camera3: Remove BufferQueue::MIN_UNDEQUEUED_BUFFERS references"	Igor Murashkin	2013-11-18	5	-8/+30
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	camera3: Remove BufferQueue::MIN_UNDEQUEUED_BUFFERS references	Igor Murashkin	2013-11-18	5	-8/+30
* \| \| \| \|	Camera2: Rework the FPS range vs. FPS single setting detection	Eino-Ville Talvala	2013-11-14	2	-33/+20
\|/ / / /
* \| \| \|	Camera API2: Add support for partial result quirk	Eino-Ville Talvala	2013-11-12	5	-14/+29
\|/ / /
* \| \|	Camera HAL3/API1: Add support for the partial result quirk.	Eino-Ville Talvala	2013-11-06	8	-86/+432
\| \|/ \|/\|
* \|	camera: Collect stack traces when bad things happen, print with dumpsys	Igor Murashkin	2013-10-29	5	-0/+171
* \|	Camera: don't do hw support check for ZSL	Zhijun He	2013-10-16	1	-13/+5
* \|	Camera: Fix deadlock in Camera3OutputStream	Zhijun He	2013-10-11	1	-1/+16
* \|	Merge "Camera: Skip AE precapture when possible" into klp-dev	Zhijun He	2013-10-11	1	-0/+12
\|\ \
\| * \|	Camera: Skip AE precapture when possible	Zhijun He	2013-10-11	1	-0/+12
* \| \|	Merge "Camera2/3: Add more tracing for API1" into klp-dev	Eino-Ville Talvala	2013-10-11	7	-2/+56
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Camera2/3: Add more tracing for API1	Eino-Ville Talvala	2013-10-10	7	-2/+56