Merge "Fix issue #3271486: SetupWizward NullPointerException in"

1 files changed, 11 insertions, 9 deletions

diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index 3dfb801611de..449992e52f58 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -2334,15 +2334,17 @@ public final class ActivityThread {
                 }
             }
 
-            Canvas cv = mThumbnailCanvas;
-            if (cv == null) {
-                mThumbnailCanvas = cv = new Canvas();
-            }
-
-            cv.setBitmap(thumbnail);
-            if (!r.activity.onCreateThumbnail(thumbnail, cv)) {
-                mAvailThumbnailBitmap = thumbnail;
-                thumbnail = null;
+            if (thumbnail != null) {
+                Canvas cv = mThumbnailCanvas;
+                if (cv == null) {
+                    mThumbnailCanvas = cv = new Canvas();
+                }
+    
+                cv.setBitmap(thumbnail);
+                if (!r.activity.onCreateThumbnail(thumbnail, cv)) {
+                    mAvailThumbnailBitmap = thumbnail;
+                    thumbnail = null;
+                }
             }
 
         } catch (Exception e) {