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

Add a null check to prevent NPE

Browse Source 
Rare case where the rect returned from a View is null.

BUG: 28118236
Change-Id: Ie95b082c92c110f753152a50399c188b19d14e4b
This commit is contained in:
Sid Soundararajan
2016-04-14 11:36:42 -07:00
parent 53553d3bcd
commit 6598b2d01a
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SystemUI/src/com/android/systemui/recents/tv/views/RecentsTvTransitionHelper.java
View File

@@ -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);
}