am 14c0c989: am 4ba4caed: Merge "Fix SkBitmap::fPixels not being locked correctly"

* commit '14c0c989d21531056a5d0a0739c3ffdd1b04b295':
  Fix SkBitmap::fPixels not being locked correctly

1 files changed, 12 insertions, 2 deletions

diff --git a/core/jni/android/graphics/Bitmap.cpp b/core/jni/android/graphics/Bitmap.cpp
index 3c27caf65c7f..1bba5b434477 100644
--- a/core/jni/android/graphics/Bitmap.cpp
+++ b/core/jni/android/graphics/Bitmap.cpp
@@ -298,8 +298,18 @@ static bool Bitmap_compress(JNIEnv* env, jobject clazz, SkBitmap* bitmap,
     }

 

     bool success = false;

-    SkWStream* strm = CreateJavaOutputStreamAdaptor(env, jstream, jstorage);

-    if (NULL != strm) {

+    if (NULL != bitmap) {

+        SkAutoLockPixels alp(*bitmap);

+

+        if (NULL == bitmap->getPixels()) {

+            return false;

+        }

+

+        SkWStream* strm = CreateJavaOutputStreamAdaptor(env, jstream, jstorage);

+        if (NULL == strm) {

+            return false;

+        }

+

         SkImageEncoder* encoder = SkImageEncoder::Create(fm);

         if (NULL != encoder) {

             success = encoder->encodeStream(strm, *bitmap, quality);