Merge "Fix NPE in TaskSnapshotController" into oc-dev

This commit is contained in:
Jorim Jaggi
2017-04-12 17:04:07 +00:00
committed by Android (Google) Code Review

View File

@@ -162,12 +162,15 @@ class TaskSnapshotController {
if (top == null) {
return null;
}
final WindowState mainWindow = top.findMainWindow();
if (mainWindow == null) {
return null;
}
final GraphicBuffer buffer = top.mDisplayContent.screenshotApplicationsToBuffer(top.token,
-1, -1, false, 1.0f, false, true);
if (buffer == null) {
return null;
}
final WindowState mainWindow = top.findMainWindow();
return new TaskSnapshot(buffer, top.getConfiguration().orientation,
minRect(mainWindow.mContentInsets, mainWindow.mStableInsets), false /* reduced */,
1f /* scale */);