From b6b9950d13fd9f16be6ba7903d69f54a01639467 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Mon, 19 Dec 2016 10:31:07 -0800 Subject: [PATCH] Fixing NPE when checking locked state. - Regression from change 9f4ab32b1c62d16f03d14a50f13f04ddb58c541f. Change-Id: I31ada9f4c051cf0aaa9a7bfa54c1b9bda1c64c16 Fixes: b/33738356 Test: Dock an app repeatedly --- .../com/android/systemui/recents/views/TaskViewThumbnail.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewThumbnail.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewThumbnail.java index 780cbca3c2b3c..f753e44f22723 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewThumbnail.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewThumbnail.java @@ -136,7 +136,7 @@ public class TaskViewThumbnail extends View { int thumbnailHeight = Math.min(viewHeight, (int) (mThumbnailRect.height() * mThumbnailScale)); - if (mTask.isLocked) { + if (mTask != null && mTask.isLocked) { canvas.drawRoundRect(0, 0, viewWidth, viewHeight, mCornerRadius, mCornerRadius, mLockedPaint); } else if (mBitmapShader != null && thumbnailWidth > 0 && thumbnailHeight > 0) {