From d67bb1ebbc5309039a4995cba2889d874fbb4394 Mon Sep 17 00:00:00 2001
From: sergeyv <sergeyv@google.com>
Date: Wed, 28 Jun 2017 12:44:03 -0700
Subject: [PATCH] Fix NPE in BitmapFactory when an allocation of hw bitmap
 failed

Test: no tests.
bug: 63044157
Change-Id: I33663c14983f2d0050521c9fea5742ae71f96c5f
---
 core/jni/android/graphics/BitmapFactory.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/jni/android/graphics/BitmapFactory.cpp b/core/jni/android/graphics/BitmapFactory.cpp
index 5a25d5e06f07f..1bc50b0c8bccf 100644
--- a/core/jni/android/graphics/BitmapFactory.cpp
+++ b/core/jni/android/graphics/BitmapFactory.cpp
@@ -579,6 +579,9 @@ static jobject doDecode(JNIEnv* env, SkStreamRewindable* stream, jobject padding
 
     if (isHardware) {
         sk_sp<Bitmap> hardwareBitmap = Bitmap::allocateHardwareBitmap(outputBitmap);
+        if (!hardwareBitmap.get()) {
+            return nullObjectReturn("Failed to allocate a hardware bitmap");
+        }
         return bitmap::createBitmap(env, hardwareBitmap.release(), bitmapCreateFlags,
                 ninePatchChunk, ninePatchInsets, -1);
     }