summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | Camera3: Fix the deadlock during recording pinch zoomingZhijun He2013-05-232-3/+15
* | | | | | | | 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
* | | | | | | | | 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 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
* | | | | | | 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
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
* | | | | | | 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 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
| |/ / / / /
* | | | | | 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 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 01831d23: Camera2/3: Increase digital zoom stepsZhijun He2013-05-211-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Camera2/3: Increase digital zoom stepsZhijun He2013-05-201-1/+1
| |/ / / / /
* | | | | | 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
| |\ \ \ \ \ | | |/ / / / | |/| | | |
* | | | | | 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
| |\ \ \ \ \
* | \ \ \ \ \ am e2dfa5a4: Merge "update to Fence::waitForever() API change" into jb-mr2-devMathias Agopian2013-05-175-8/+4
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge "update to Fence::waitForever() API change" into jb-mr2-devMathias Agopian2013-05-175-8/+4
| |\ \ \ \ \ \
| | * | | | | | update to Fence::waitForever() API changeMathias Agopian2013-05-165-8/+4
* | | | | | | | am 4224dedf: Merge "Adjust timestamp scale" into jb-mr2-devAndy McFadden2013-05-172-4/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Adjust timestamp scale" into jb-mr2-devAndy McFadden2013-05-172-4/+4
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Adjust timestamp scaleAndy McFadden2013-05-162-4/+4
| | |/ / / / /
* | | | | | | am 99f27cdf: wifi-display: retry UDP read/write to improve connection robustnessChong Zhang2013-05-161-4/+25
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | wifi-display: retry UDP read/write to improve connection robustnessChong Zhang2013-05-161-4/+25
| |/ / / / /
* | | | | | Reconcile with AOSPJean-Baptiste Queru2013-05-160-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge "Replace obsolete CLOCK_MONOTONIC_HR by CLOCK_MONOTONIC"Elliott Hughes2013-05-141-2/+2
| |\ \ \ \ \
| | * | | | | Replace obsolete CLOCK_MONOTONIC_HR by CLOCK_MONOTONICGlenn Kasten2013-05-141-2/+2
| |/ / / / /
| * | | | | Merge "Fix overflow of rand in ARTPConnection"Andreas Huber2013-04-241-1/+2
| |\ \ \ \ \
| | * | | | | Fix overflow of rand in ARTPConnectionYajun Zeng2013-04-241-1/+2
| * | | | | | Merge "fix a race condition of MediaPlayerServce::Client::mClient"Andreas Huber2013-04-241-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge "Fixed the wrong timestamps issue about camera recording"Marco Nelissen2013-04-221-1/+1
| |\ \ \ \ \ \
| | * | | | | | Fixed the wrong timestamps issue about camera recordingJun Tian2013-04-221-1/+1
| |/ / / / / /
* | | | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-160-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-150-0/+0
| |\ \ \ \ \ \
| | * \ \ \ \ \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-140-0/+0
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-140-0/+0
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-130-0/+0
| | | | |\ \ \ \ \ \