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 am: e4d2c176c6

Browse Source 
Change-Id: I3d35116ecd8026bca6a771da95dc9da58a6d620f
This commit is contained in:
Hongwei Wang
2020-04-07 23:18:17 +00:00
committed by Automerger Merge Worker
parent a26b2f91e1 e4d2c176c6
commit 46332fe143
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,
boolean creating) {
final TaskDisplayArea taskDisplayArea = getDisplayArea();
if (taskDisplayArea == null) {
Slog.d(TAG, "taskDisplayArea is null, bail early");
return;
}
final int currentMode = getWindowingMode();
final int currentOverrideMode = getRequestedOverrideWindowingMode();
final TaskDisplayArea taskDisplayArea = getDisplayArea();
final Task topTask = getTopMostTask();
int windowingMode = preferredWindowingMode;
if (preferredWindowingMode == WINDOWING_MODE_UNDEFINED