Fix issue #3271486: SetupWizward NullPointerException in

andriod.app.ActivityThread.performStopActivityInner Change-Id: Ifce73b7fc48fedb4767d759f70c98fcdee510f36
2010-12-09 13:14:12 -08:00
parent 6b82c26607
commit fb3806d68d
1 changed files with 11 additions and 9 deletions
--- 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) {