| commit | f105b28e94c50802cab61ec4cdf4986e9dd3c097 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Tue Apr 28 22:07:15 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Apr 28 22:07:16 2015 +0000 |
| tree | 689c399f391c039ab5ee1b4c953bce039f41f55e | |
| parent | f62a067a5b21c840c915d36392679346ac0abfd7 [diff] | |
| parent | 4c3ba337bacce05165d37f63dfa0b7e845c391e0 [diff] |
Merge "Check allocation" into mnc-dev
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 @@ 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