ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "GUI: Remove unused variables"

Browse Source
This commit is contained in:
Andreas Gampe 2014-12-09 19:57:05 +00:00 committed by Gerrit Code Review
commit a59d7a6a66
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/gui/CpuConsumer.cpp
View File

@ -194,7 +194,6 @@ status_t CpuConsumer::lockNextBuffer(LockedBuffer *nativeBuffer) {
status_t CpuConsumer::unlockBuffer(const LockedBuffer &nativeBuffer) { status_t CpuConsumer::unlockBuffer(const LockedBuffer &nativeBuffer) {
Mutex::Autolock _l(mMutex); Mutex::Autolock _l(mMutex);
size_t lockedIdx = 0; size_t lockedIdx = 0;
status_t err;
void *bufPtr = reinterpret_cast<void *>(nativeBuffer.data); void *bufPtr = reinterpret_cast<void *>(nativeBuffer.data);
for (; lockedIdx < static_cast<size_t>(mMaxLockedBuffers); lockedIdx++) { for (; lockedIdx < static_cast<size_t>(mMaxLockedBuffers); lockedIdx++) {

2
libs/gui/ISurfaceComposer.cpp
View File

@ -55,7 +55,6 @@ public:
virtual sp<ISurfaceComposerClient> createConnection() virtual sp<ISurfaceComposerClient> createConnection()
{ {
uint32_t n;
Parcel data, reply; Parcel data, reply;
data.writeInterfaceToken(ISurfaceComposer::getInterfaceDescriptor()); data.writeInterfaceToken(ISurfaceComposer::getInterfaceDescriptor());
remote()->transact(BnSurfaceComposer::CREATE_CONNECTION, data, &reply); remote()->transact(BnSurfaceComposer::CREATE_CONNECTION, data, &reply);
@ -64,7 +63,6 @@ public:
virtual sp<IGraphicBufferAlloc> createGraphicBufferAlloc() virtual sp<IGraphicBufferAlloc> createGraphicBufferAlloc()
{ {
uint32_t n;
Parcel data, reply; Parcel data, reply;
data.writeInterfaceToken(ISurfaceComposer::getInterfaceDescriptor()); data.writeInterfaceToken(ISurfaceComposer::getInterfaceDescriptor());
remote()->transact(BnSurfaceComposer::CREATE_GRAPHIC_BUFFER_ALLOC, data, &reply); remote()->transact(BnSurfaceComposer::CREATE_GRAPHIC_BUFFER_ALLOC, data, &reply);

5
libs/gui/Surface.cpp
View File

@ -96,8 +96,8 @@ void Surface::setSidebandStream(const sp<NativeHandle>& stream) {
void Surface::allocateBuffers() { void Surface::allocateBuffers() {
uint32_t reqWidth = mReqWidth ? mReqWidth : mUserWidth; uint32_t reqWidth = mReqWidth ? mReqWidth : mUserWidth;
uint32_t reqHeight = mReqHeight ? mReqHeight : mUserHeight; uint32_t reqHeight = mReqHeight ? mReqHeight : mUserHeight;
mGraphicBufferProducer->allocateBuffers(mSwapIntervalZero, mReqWidth, mGraphicBufferProducer->allocateBuffers(mSwapIntervalZero, reqWidth,
mReqHeight, mReqFormat, mReqUsage); reqHeight, mReqFormat, mReqUsage);
} }
int Surface::hook_setSwapInterval(ANativeWindow* window, int interval) { int Surface::hook_setSwapInterval(ANativeWindow* window, int interval) {
@ -274,7 +274,6 @@ int Surface::cancelBuffer(android_native_buffer_t* buffer,
int Surface::getSlotFromBufferLocked( int Surface::getSlotFromBufferLocked(
android_native_buffer_t* buffer) const { android_native_buffer_t* buffer) const {
bool dumpedState = false;
for (int i = 0; i < NUM_BUFFER_SLOTS; i++) { for (int i = 0; i < NUM_BUFFER_SLOTS; i++) {
if (mSlots[i].buffer != NULL && if (mSlots[i].buffer != NULL &&
mSlots[i].buffer->handle == buffer->handle) { mSlots[i].buffer->handle == buffer->handle) {