summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* camera: Make some binder interfaces compatible with AIDLIgor Murashkin2013-06-1110-6/+106
* am 22a5ddb6: am 6f6b31da: Merge "Camera3: Fix the deadlock during recording p...Zhijun He2013-05-242-3/+15
|\
| * am 6f6b31da: Merge "Camera3: Fix the deadlock during recording pinch zooming"...Zhijun He2013-05-242-3/+15
| |\
| | * Merge "Camera3: Fix the deadlock during recording pinch zooming" into jb-mr2-devZhijun He2013-05-242-3/+15
| | |\
| | | * Camera3: Fix the deadlock during recording pinch zoomingZhijun He2013-05-232-3/+15
* | | | am 14e585c8: am 6947f125: Merge "camera3: Disable ZSL for limited mode camera...Ed Heyl2013-05-241-5/+13
|\ \ \ \ | |/ / /
| * | | am 6947f125: Merge "camera3: Disable ZSL for limited mode camera HALs" into j...Ed Heyl2013-05-231-5/+13
| |\ \ \ | | |/ /
| | * | Merge "camera3: Disable ZSL for limited mode camera HALs" into jb-mr2-devEd Heyl2013-05-241-5/+13
| | |\ \
| | | * | camera3: Disable ZSL for limited mode camera HALsIgor Murashkin2013-05-231-5/+13
* | | | | Merge "Add support for MPEG editlist gapless info"Marco Nelissen2013-05-231-0/+61
|\ \ \ \ \
| * | | | | Add support for MPEG editlist gapless infoMarco Nelissen2013-05-231-0/+61
* | | | | | stagefright: BufferProducer updatesLajos Molnar2013-05-235-44/+58
* | | | | | am 9b89c15d: am ca3fb120: Merge "camera3: Fix zsl buffers released-while-in-u...Igor Murashkin2013-05-232-12/+20
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am ca3fb120: Merge "camera3: Fix zsl buffers released-while-in-use race condi...Igor Murashkin2013-05-232-12/+20
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge "camera3: Fix zsl buffers released-while-in-use race condition" into jb...Igor Murashkin2013-05-232-12/+20
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | camera3: Fix zsl buffers released-while-in-use race conditionIgor Murashkin2013-05-222-12/+20
| | | | |/ | | | |/|
* | | | | am 98730cd7: am 1f7f83b7: Merge "Camera3: Make sure new metadata results sign...Igor Murashkin2013-05-233-0/+39
|\ \ \ \ \ | |/ / / /
| * | | | am 1f7f83b7: Merge "Camera3: Make sure new metadata results signal other thre...Igor Murashkin2013-05-233-0/+39
| |\ \ \ \ | | |/ / /
| | * | | Merge "Camera3: Make sure new metadata results signal other threads waiting" ...Igor Murashkin2013-05-233-0/+39
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Camera3: Make sure new metadata results signal other threads waitingIgor Murashkin2013-05-223-0/+39
* | | | | am a842a2a6: (-s ours) Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-230-0/+0
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-230-0/+0
| |\ \ \
| | * \ \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-230-0/+0
| | |\ \ \ | | | |/ / | | |/| |
* | | | | stagefright: SoftVP8: Handle EOS flag on frames with content.Lajos Molnar2013-05-221-12/+16
* | | | | am b7337d56: am ed49d7b5: Merge "camera3: Fix recording failure when switchin...Igor Murashkin2013-05-223-4/+27
|\ \ \ \ \ | |/ / / /
| * | | | am ed49d7b5: Merge "camera3: Fix recording failure when switching resolutions...Igor Murashkin2013-05-223-4/+27
| |\ \ \ \ | | |/ / /
| | * | | Merge "camera3: Fix recording failure when switching resolutions while previe...Igor Murashkin2013-05-223-4/+27
| | |\ \ \
| | | * | | camera3: Fix recording failure when switching resolutions while preview onIgor Murashkin2013-05-223-4/+27
| | | | |/ | | | |/|
* | | | | am 1d60db8b: am c2c874d8: Camera3: Fix Bug minTimestamp is never greater than...Mansoor Aftab2013-05-221-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | am c2c874d8: Camera3: Fix Bug minTimestamp is never greater than frame timestampMansoor Aftab2013-05-221-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Camera3: Fix Bug minTimestamp is never greater than frame timestampMansoor Aftab2013-05-221-1/+1
| | |/ /
* | | | am cf2148e8: (-s ours) Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-220-0/+0
|\ \ \ \ | |/ / /
| * | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-220-0/+0
| |\ \ \ | | | |/ | | |/|
| | * | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-220-0/+0
| | |\ \ | | | |/ | | |/|
| | | * Avoid a deadlock during EmptyBufferDoneAndreas Huber2013-05-211-11/+17
* | | | am 9545b670: am f21daf47: Merge "Avoid a deadlock during EmptyBufferDone" int...Jamie Gennis2013-05-211-11/+17
|\ \ \ \ | |/ / /
| * | | am f21daf47: Merge "Avoid a deadlock during EmptyBufferDone" into jb-mr2-devJamie Gennis2013-05-211-11/+17
| |\ \ \ | | |/ /
| | * | Merge "Avoid a deadlock during EmptyBufferDone" into jb-mr2-devJamie Gennis2013-05-211-11/+17
| | |\ \
| | | * | Avoid a deadlock during EmptyBufferDoneAndreas Huber2013-05-201-11/+17
* | | | | am 722e4892: am 01831d23: Camera2/3: Increase digital zoom stepsZhijun He2013-05-211-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | am 01831d23: Camera2/3: Increase digital zoom stepsZhijun He2013-05-211-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Camera2/3: Increase digital zoom stepsZhijun He2013-05-201-1/+1
| | |/ /
* | | | Update to supply correct name for new power manager app ops.Dianne Hackborn2013-05-201-1/+2
* | | | am d7630634: (-s ours) Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-200-0/+0
|\ \ \ \ | |/ / /
| * | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-200-0/+0
| |\ \ \ | | | |/ | | |/|
| | * | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-190-0/+0
| | |\ \ | | | |/ | | |/|
* | | | wifi-display: add support for metadata mode on encoder outputChong Zhang2013-05-1716-50/+432
* | | | am 81972daf: (-s ours) Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-170-0/+0
|\ \ \ \ | |/ / /
| * | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-170-0/+0
| |\ \ \ | | | |/ | | |/|
| | * | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-160-0/+0
| | |\ \