From fb3806d68d51d336cba0ace697b1bae3e699a890 Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Thu, 9 Dec 2010 13:14:12 -0800 Subject: Fix issue #3271486: SetupWizward NullPointerException in andriod.app.ActivityThread.performStopActivityInner Change-Id: Ifce73b7fc48fedb4767d759f70c98fcdee510f36 --- core/java/android/app/ActivityThread.java | 20 +++++++++++--------- 1 file 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) { -- cgit v1.2.3-59-g8ed1b