commit 0e001fce7d0886903aef068d4557f8b73db61cc5
author Dan Stoza <stoza@google.com> Tue Apr 28 14:51:19 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Apr 28 14:51:19 2015 +0000
tree 868d7cd0ec72f7c7227bb30c4fe90f5f6b747c62
parent 03b0f717ca8f78f5f905c62987f73732b11663f7
parent 692f288a64d87e426940905c54a874aea6732116

am 692f288a: am e54fbaa2: Merge "ImageWriter: Change detach to sp<GraphicBuffer>" into mnc-dev

* commit '692f288a64d87e426940905c54a874aea6732116':
  ImageWriter: Change detach to sp<GraphicBuffer>

media/jni/android_media_ImageWriter.cpp

diff --git a/media/jni/android_media_ImageWriter.cpp b/media/jni/android_media_ImageWriter.cpp
index 8c76665..294cd84 100644
--- a/media/jni/android_media_ImageWriter.cpp
+++ b/media/jni/android_media_ImageWriter.cpp
@@ -160,7 +160,7 @@
         // Writer. Do the detach unconditionally for opaque format now. see b/19977520
         if (mFormat == HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED) {
             sp<Fence> fence;
-            ANativeWindowBuffer* buffer;
+            sp<GraphicBuffer> buffer;
             ALOGV("%s: One buffer is detached", __FUNCTION__);
             mProducer->detachNextBuffer(&buffer, &fence);
         }