Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix issue #3271486: SetupWizward NullPointerException in"

Browse Source
This commit is contained in:
Dianne Hackborn
2010-12-09 13:16:49 -08:00
committed by Android (Google) Code Review
parent a58fd15a5b fb3806d68d
commit bca1c4ffad
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/java/android/app/ActivityThread.java
View File

@@ -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) {