am 5d11a72b: am 8fd567b1: Merge "Libui: Remove unused variables"

* commit '5d11a72bcd7d92ea0c0bf3959ed45380264f0495':
  Libui: Remove unused variables
This commit is contained in:
Andreas Gampe 2014-12-09 23:24:10 +00:00 committed by Android Git Automerger
commit 80ea4e0373

View File

@ -78,7 +78,6 @@ FramebufferNativeWindow::FramebufferNativeWindow()
{ {
hw_module_t const* module; hw_module_t const* module;
if (hw_get_module(GRALLOC_HARDWARE_MODULE_ID, &module) == 0) { if (hw_get_module(GRALLOC_HARDWARE_MODULE_ID, &module) == 0) {
int stride;
int err; int err;
int i; int i;
err = framebuffer_open(module, &fbDev); err = framebuffer_open(module, &fbDev);
@ -239,7 +238,6 @@ int FramebufferNativeWindow::dequeueBuffer(ANativeWindow* window,
{ {
FramebufferNativeWindow* self = getSelf(window); FramebufferNativeWindow* self = getSelf(window);
Mutex::Autolock _l(self->mutex); Mutex::Autolock _l(self->mutex);
framebuffer_device_t* fb = self->fbDev;
int index = self->mBufferHead++; int index = self->mBufferHead++;
if (self->mBufferHead >= self->mNumBuffers) if (self->mBufferHead >= self->mNumBuffers)
@ -284,7 +282,6 @@ int FramebufferNativeWindow::queueBuffer(ANativeWindow* window,
sp<Fence> fence(new Fence(fenceFd)); sp<Fence> fence(new Fence(fenceFd));
fence->wait(Fence::TIMEOUT_NEVER); fence->wait(Fence::TIMEOUT_NEVER);
const int index = self->mCurrentBufferIndex;
int res = fb->post(fb, handle); int res = fb->post(fb, handle);
self->front = static_cast<NativeBuffer*>(buffer); self->front = static_cast<NativeBuffer*>(buffer);
self->mNumFreeBuffers++; self->mNumFreeBuffers++;