diff options
| author | Naveen Leekha <leekha@google.com> | 2015-09-24 23:55:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-24 23:55:17 +0000 |
| commit | bac4a44ac909dbf09ce7a25bd2173164fc437c74 (patch) | |
| tree | a255e7b27ef6f6b363f16d6f60081d44fa98ec87 | |
| parent | b062a7a10d014c30f2c59761010fa4e4f876e85c (diff) | |
| parent | 53aa7d80cf64f2f2c0c935be8528a513b32341b2 (diff) | |
| download | frameworks_native-bac4a44ac909dbf09ce7a25bd2173164fc437c74.zip frameworks_native-bac4a44ac909dbf09ce7a25bd2173164fc437c74.tar.gz frameworks_native-bac4a44ac909dbf09ce7a25bd2173164fc437c74.tar.bz2 | |
am 53aa7d80: am b0127aad: am 69412a51: am c4bd7211: resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev
* commit '53aa7d80cf64f2f2c0c935be8528a513b32341b2':
resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev
| -rw-r--r-- | libs/gui/IGraphicBufferProducer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/gui/IGraphicBufferProducer.cpp b/libs/gui/IGraphicBufferProducer.cpp index 2118c92..8bdbc22 100644 --- a/libs/gui/IGraphicBufferProducer.cpp +++ b/libs/gui/IGraphicBufferProducer.cpp @@ -348,7 +348,7 @@ status_t BnGraphicBufferProducer::onTransact( uint32_t height = data.readUint32(); PixelFormat format = static_cast<PixelFormat>(data.readInt32()); uint32_t usage = data.readUint32(); - int buf; + int buf = 0; sp<Fence> fence; int result = dequeueBuffer(&buf, &fence, async, width, height, format, usage); @@ -416,7 +416,7 @@ status_t BnGraphicBufferProducer::onTransact( } case QUERY: { CHECK_INTERFACE(IGraphicBufferProducer, data, reply); - int value; + int value = 0; int what = data.readInt32(); int res = query(what, &value); reply->writeInt32(value); |