diff options
| author | Naveen Leekha <leekha@google.com> | 2015-09-24 15:55:21 -0700 |
|---|---|---|
| committer | Naveen Leekha <leekha@google.com> | 2015-09-24 15:55:21 -0700 |
| commit | c4bd7211373cf5b745c7d4f849f43f7a2d2b1141 (patch) | |
| tree | 2a76f16e90d40795bfb26d9d239cd2431c619051 /libs | |
| parent | e889592e33891c9b88ff6ba655426118f8ef12ee (diff) | |
| download | frameworks_native-c4bd7211373cf5b745c7d4f849f43f7a2d2b1141.zip frameworks_native-c4bd7211373cf5b745c7d4f849f43f7a2d2b1141.tar.gz frameworks_native-c4bd7211373cf5b745c7d4f849f43f7a2d2b1141.tar.bz2 | |
resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev
Change-Id: I543df164076b44578b14d41031800bb62b81586d
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 d09eba0..74a40ee 100644 --- a/libs/gui/IGraphicBufferProducer.cpp +++ b/libs/gui/IGraphicBufferProducer.cpp @@ -324,7 +324,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); @@ -392,7 +392,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); |