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

Merge "Fix NPE when removing PIP stack" into rvc-dev

Browse Source
This commit is contained in:
Hongwei Wang
2020-04-07 23:17:24 +00:00
committed by Android (Google) Code Review
parent 3bf50bddb3 f488523ee7
commit e4d2c176c6
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/wm/ActivityStack.java
View File

@@ -715,9 +715,13 @@ class ActivityStack extends Task {
private void setWindowingModeInSurfaceTransaction(int preferredWindowingMode, private void setWindowingModeInSurfaceTransaction(int preferredWindowingMode,
boolean creating) { boolean creating) {
final TaskDisplayArea taskDisplayArea = getDisplayArea();
if (taskDisplayArea == null) {
Slog.d(TAG, "taskDisplayArea is null, bail early");
return;
}
final int currentMode = getWindowingMode(); final int currentMode = getWindowingMode();
final int currentOverrideMode = getRequestedOverrideWindowingMode(); final int currentOverrideMode = getRequestedOverrideWindowingMode();
final TaskDisplayArea taskDisplayArea = getDisplayArea();
final Task topTask = getTopMostTask(); final Task topTask = getTopMostTask();
int windowingMode = preferredWindowingMode; int windowingMode = preferredWindowingMode;
if (preferredWindowingMode == WINDOWING_MODE_UNDEFINED if (preferredWindowingMode == WINDOWING_MODE_UNDEFINED