diff options
| author | Naveen Leekha <leekha@google.com> | 2015-09-24 23:27:31 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-24 23:27:31 +0000 |
| commit | 69412a51f58fa9450f1cb077c8d4b6410128d993 (patch) | |
| tree | f6f11ce1cfe6cd287a059393619b94829faf9849 /libs | |
| parent | 571e27e20e30560985d7c3a3ba8885693695b0fc (diff) | |
| parent | c4bd7211373cf5b745c7d4f849f43f7a2d2b1141 (diff) | |
| download | frameworks_native-69412a51f58fa9450f1cb077c8d4b6410128d993.zip frameworks_native-69412a51f58fa9450f1cb077c8d4b6410128d993.tar.gz frameworks_native-69412a51f58fa9450f1cb077c8d4b6410128d993.tar.bz2 | |
am c4bd7211: resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev
* commit 'c4bd7211373cf5b745c7d4f849f43f7a2d2b1141':
resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev
Diffstat (limited to 'libs')
| -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); |