diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2015-04-28 17:50:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-28 17:50:20 +0000 |
| commit | f62a067a5b21c840c915d36392679346ac0abfd7 (patch) | |
| tree | 249e05d9912666ee8bb435b2b2ee62c08462e9e3 /services | |
| parent | 466dc8ed6ca6b7f585104806c48613dd34e608c9 (diff) | |
| parent | 27b0159fa29b85b63f7bcad83bd13c70355a7bcd (diff) | |
| download | frameworks_av-f62a067a5b21c840c915d36392679346ac0abfd7.zip frameworks_av-f62a067a5b21c840c915d36392679346ac0abfd7.tar.gz frameworks_av-f62a067a5b21c840c915d36392679346ac0abfd7.tar.bz2 | |
Merge "DO NOT MERGE: The preview frame data is broken when sending via Binder" into mnc-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/camera/libcameraservice/api1/client2/CallbackProcessor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/api1/client2/CallbackProcessor.cpp b/services/camera/libcameraservice/api1/client2/CallbackProcessor.cpp index 5c8f750..88c5811 100644 --- a/services/camera/libcameraservice/api1/client2/CallbackProcessor.cpp +++ b/services/camera/libcameraservice/api1/client2/CallbackProcessor.cpp @@ -395,7 +395,7 @@ status_t CallbackProcessor::processNewCallback(sp<Camera2Client> &client) { heapIdx = mCallbackHeapHead; - mCallbackHeapHead = (mCallbackHeapHead + 1) & kCallbackHeapCount; + mCallbackHeapHead = (mCallbackHeapHead + 1) % kCallbackHeapCount; mCallbackHeapFree--; // TODO: Get rid of this copy by passing the gralloc queue all the way |