From 6598b2d01a8c21d8ea53f5fb3b96b8a35012cb0f Mon Sep 17 00:00:00 2001 From: Sid Soundararajan Date: Thu, 14 Apr 2016 11:36:42 -0700 Subject: [PATCH] Add a null check to prevent NPE Rare case where the rect returned from a View is null. BUG: 28118236 Change-Id: Ie95b082c92c110f753152a50399c188b19d14e4b --- .../recents/tv/views/RecentsTvTransitionHelper.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/recents/tv/views/RecentsTvTransitionHelper.java b/packages/SystemUI/src/com/android/systemui/recents/tv/views/RecentsTvTransitionHelper.java index 5b94ebe4e2395..812bff1b84a7b 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/tv/views/RecentsTvTransitionHelper.java +++ b/packages/SystemUI/src/com/android/systemui/recents/tv/views/RecentsTvTransitionHelper.java @@ -121,11 +121,13 @@ public class RecentsTvTransitionHelper { } try { Rect taskRect = taskView.getFocusedThumbnailRect(); - Bitmap thumbnail = Bitmap.createScaledBitmap(task.thumbnail, taskRect.width(), - taskRect.height(), false); - WindowManagerGlobal.getWindowManagerService() - .overridePendingAppTransitionAspectScaledThumb(thumbnail, taskRect.left, - taskRect.top, taskRect.width(), taskRect.height(), callback, true); + if (taskRect != null) { + Bitmap thumbnail = Bitmap.createScaledBitmap(task.thumbnail, taskRect.width(), + taskRect.height(), false); + WindowManagerGlobal.getWindowManagerService() + .overridePendingAppTransitionAspectScaledThumb(thumbnail, taskRect.left, + taskRect.top, taskRect.width(), taskRect.height(), callback, true); + } } catch (RemoteException e) { Log.w(TAG, "Failed to override transition: " + e); }