diff options
| author | Pat Tjin <pattjin@google.com> | 2014-08-22 22:04:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-22 22:04:37 +0000 |
| commit | 5fa3f3a995ba5bd86e460b1b5f72b2f1ada699fb (patch) | |
| tree | bd35683481fa9f0bebd76a0b69fcdb6fc48adefa | |
| parent | c9991c7149ccd320200ad62ac0036fe57c5cc831 (diff) | |
| parent | 5474f3396a963196fa6dc05add85429e2358ec1a (diff) | |
| download | frameworks_base-5fa3f3a995ba5bd86e460b1b5f72b2f1ada699fb.zip frameworks_base-5fa3f3a995ba5bd86e460b1b5f72b2f1ada699fb.tar.gz frameworks_base-5fa3f3a995ba5bd86e460b1b5f72b2f1ada699fb.tar.bz2 | |
Merge "SurfaceControl: free ref when not used anymore" into lmp-dev
| -rw-r--r-- | core/jni/android_view_SurfaceControl.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/jni/android_view_SurfaceControl.cpp b/core/jni/android_view_SurfaceControl.cpp index 3fb084a..8f30f5d 100644 --- a/core/jni/android_view_SurfaceControl.cpp +++ b/core/jni/android_view_SurfaceControl.cpp @@ -180,7 +180,8 @@ static jobject nativeScreenshotBitmap(JNIEnv* env, jclass clazz, // takes ownership of ScreenshotClient SkMallocPixelRef* pixels = SkMallocPixelRef::NewWithProc(screenshotInfo, (size_t) rowBytes, NULL, (void*) screenshot->getPixels(), &DeleteScreenshot, - (void*) (screenshot.detach())); + (void*) (screenshot.get())); + screenshot.detach(); pixels->setImmutable(); bitmap->setPixelRef(pixels)->unref(); bitmap->lockPixels(); |