Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | | Camera3: Fix the deadlock during recording pinch zooming | Zhijun He | 2013-05-23 | 2 | -3/+15 | |
* | | | | | | | | am 6947f125: Merge "camera3: Disable ZSL for limited mode camera HALs" into j... | Ed Heyl | 2013-05-23 | 1 | -5/+13 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | Merge "camera3: Disable ZSL for limited mode camera HALs" into jb-mr2-dev | Ed Heyl | 2013-05-24 | 1 | -5/+13 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | camera3: Disable ZSL for limited mode camera HALs | Igor Murashkin | 2013-05-23 | 1 | -5/+13 | |
* | | | | | | | | | am ca3fb120: Merge "camera3: Fix zsl buffers released-while-in-use race condi... | Igor Murashkin | 2013-05-23 | 2 | -12/+20 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | ||||||
| * | | | | | | | | Merge "camera3: Fix zsl buffers released-while-in-use race condition" into jb... | Igor Murashkin | 2013-05-23 | 2 | -12/+20 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | / / / / | | |_|_|/ / / / | |/| | | | | | | ||||||
| | * | | | | | | camera3: Fix zsl buffers released-while-in-use race condition | Igor Murashkin | 2013-05-22 | 2 | -12/+20 | |
| | |/ / / / / | ||||||
* | | | | | | | am 1f7f83b7: Merge "Camera3: Make sure new metadata results signal other thre... | Igor Murashkin | 2013-05-23 | 3 | -0/+39 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | Merge "Camera3: Make sure new metadata results signal other threads waiting" ... | Igor Murashkin | 2013-05-23 | 3 | -0/+39 | |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| | * | | | | | Camera3: Make sure new metadata results signal other threads waiting | Igor Murashkin | 2013-05-22 | 3 | -0/+39 | |
* | | | | | | | Reconcile with jb-mr2-release - do not merge | The Android Open Source Project | 2013-05-23 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | ||||||
| * | | | | | | merge in jb-mr2-release history after reset to jb-mr2-dev | The Android Automerger | 2013-05-23 | 0 | -0/+0 | |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | am ed49d7b5: Merge "camera3: Fix recording failure when switching resolutions... | Igor Murashkin | 2013-05-22 | 3 | -4/+27 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | Merge "camera3: Fix recording failure when switching resolutions while previe... | Igor Murashkin | 2013-05-22 | 3 | -4/+27 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | camera3: Fix recording failure when switching resolutions while preview on | Igor Murashkin | 2013-05-22 | 3 | -4/+27 | |
| | | |/ / / / | | |/| | | | | ||||||
* | | | | | | | am c2c874d8: Camera3: Fix Bug minTimestamp is never greater than frame timestamp | Mansoor Aftab | 2013-05-22 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | Camera3: Fix Bug minTimestamp is never greater than frame timestamp | Mansoor Aftab | 2013-05-22 | 1 | -1/+1 | |
| |/ / / / / | ||||||
* | | | | | | Reconcile with jb-mr2-release - do not merge | The Android Open Source Project | 2013-05-22 | 0 | -0/+0 | |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| * | | | | | merge in jb-mr2-release history after reset to jb-mr2-dev | The Android Automerger | 2013-05-22 | 0 | -0/+0 | |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| | * | | | | Avoid a deadlock during EmptyBufferDone | Andreas Huber | 2013-05-21 | 1 | -11/+17 | |
* | | | | | | am f21daf47: Merge "Avoid a deadlock during EmptyBufferDone" into jb-mr2-dev | Jamie Gennis | 2013-05-21 | 1 | -11/+17 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | Merge "Avoid a deadlock during EmptyBufferDone" into jb-mr2-dev | Jamie Gennis | 2013-05-21 | 1 | -11/+17 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Avoid a deadlock during EmptyBufferDone | Andreas Huber | 2013-05-20 | 1 | -11/+17 | |
* | | | | | | | am 01831d23: Camera2/3: Increase digital zoom steps | Zhijun He | 2013-05-21 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | Camera2/3: Increase digital zoom steps | Zhijun He | 2013-05-20 | 1 | -1/+1 | |
| |/ / / / / | ||||||
* | | | | | | Reconcile with jb-mr2-release - do not merge | The Android Open Source Project | 2013-05-20 | 0 | -0/+0 | |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| * | | | | | merge in jb-mr2-release history after reset to jb-mr2-dev | The Android Automerger | 2013-05-19 | 0 | -0/+0 | |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
* | | | | | | Reconcile with jb-mr2-release - do not merge | The Android Open Source Project | 2013-05-17 | 0 | -0/+0 | |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| * | | | | | merge in jb-mr2-release history after reset to jb-mr2-dev | The Android Automerger | 2013-05-16 | 0 | -0/+0 | |
| |\ \ \ \ \ | ||||||
* | \ \ \ \ \ | am e2dfa5a4: Merge "update to Fence::waitForever() API change" into jb-mr2-dev | Mathias Agopian | 2013-05-17 | 5 | -8/+4 | |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | ||||||
| * | | | | | | Merge "update to Fence::waitForever() API change" into jb-mr2-dev | Mathias Agopian | 2013-05-17 | 5 | -8/+4 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | update to Fence::waitForever() API change | Mathias Agopian | 2013-05-16 | 5 | -8/+4 | |
* | | | | | | | | am 4224dedf: Merge "Adjust timestamp scale" into jb-mr2-dev | Andy McFadden | 2013-05-17 | 2 | -4/+4 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | Merge "Adjust timestamp scale" into jb-mr2-dev | Andy McFadden | 2013-05-17 | 2 | -4/+4 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||||
| | * | | | | | | Adjust timestamp scale | Andy McFadden | 2013-05-16 | 2 | -4/+4 | |
| | |/ / / / / | ||||||
* | | | | | | | am 99f27cdf: wifi-display: retry UDP read/write to improve connection robustness | Chong Zhang | 2013-05-16 | 1 | -4/+25 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | wifi-display: retry UDP read/write to improve connection robustness | Chong Zhang | 2013-05-16 | 1 | -4/+25 | |
| |/ / / / / | ||||||
* | | | | | | Reconcile with AOSP | Jean-Baptiste Queru | 2013-05-16 | 0 | -0/+0 | |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | ||||||
| * | | | | | Merge "Replace obsolete CLOCK_MONOTONIC_HR by CLOCK_MONOTONIC" | Elliott Hughes | 2013-05-14 | 1 | -2/+2 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Replace obsolete CLOCK_MONOTONIC_HR by CLOCK_MONOTONIC | Glenn Kasten | 2013-05-14 | 1 | -2/+2 | |
| |/ / / / / | ||||||
| * | | | | | Merge "Fix overflow of rand in ARTPConnection" | Andreas Huber | 2013-04-24 | 1 | -1/+2 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Fix overflow of rand in ARTPConnection | Yajun Zeng | 2013-04-24 | 1 | -1/+2 | |
| * | | | | | | Merge "fix a race condition of MediaPlayerServce::Client::mClient" | Andreas Huber | 2013-04-24 | 1 | -1/+1 | |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| * | | | | | | Merge "Fixed the wrong timestamps issue about camera recording" | Marco Nelissen | 2013-04-22 | 1 | -1/+1 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Fixed the wrong timestamps issue about camera recording | Jun Tian | 2013-04-22 | 1 | -1/+1 | |
| |/ / / / / / | ||||||
* | | | | | | | Reconcile with jb-mr2-release - do not merge | The Android Open Source Project | 2013-05-16 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | ||||||
| * | | | | | | merge in jb-mr2-release history after reset to jb-mr2-dev | The Android Automerger | 2013-05-15 | 0 | -0/+0 | |
| |\ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ | merge in jb-mr2-release history after reset to jb-mr2-dev | The Android Automerger | 2013-05-14 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ | merge in jb-mr2-release history after reset to jb-mr2-dev | The Android Automerger | 2013-05-14 | 0 | -0/+0 | |
| | | |\ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ | merge in jb-mr2-release history after reset to jb-mr2-dev | The Android Automerger | 2013-05-13 | 0 | -0/+0 | |
| | | | |\ \ \ \ \ \ |