commit 4794829a1e53bc5e0a6aaaf7daff49497f369573
author Hyunyoung Song <hyunyoungs@google.com> Mon Apr 03 17:49:19 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Apr 03 17:49:19 2017 +0000
tree 70f10a5432c5039d2217aa8d07264a837824d634
parent c91c16b55731ac4f2e25087499ca782e17611b89
parent d16d17881eed5ab887e9906efd7f3ddeeab61cc9

Merge "Prevent NPE when draw is called without bounds being set Test: unit test inside AdaptiveIconDrawableTest.java" into oc-dev am: 891e03203c
am: d16d17881e

Change-Id: I96db9ee1a5bb9fc2085e43733638a6b21f50fe65

graphics/java/android/graphics/drawable/AdaptiveIconDrawable.java

diff --git a/graphics/java/android/graphics/drawable/AdaptiveIconDrawable.java b/graphics/java/android/graphics/drawable/AdaptiveIconDrawable.java
index c6c9271..643c0da 100644
--- a/graphics/java/android/graphics/drawable/AdaptiveIconDrawable.java
+++ b/graphics/java/android/graphics/drawable/AdaptiveIconDrawable.java
@@ -304,6 +304,9 @@
 
     @Override
     public void draw(Canvas canvas) {
+        if (mLayersBitmap == null) {
+            return;
+        }
         if (mLayersShader == null) {
             mCanvas.setBitmap(mLayersBitmap);
             for (int i = 0; i < mLayerState.N_CHILDREN; i++) {