diff options
| author | 2024-10-09 11:21:11 +0000 | |
|---|---|---|
| committer | 2024-10-09 11:21:11 +0000 | |
| commit | 717c0ad2dc3708b65794a7097185ea415290e7c8 (patch) | |
| tree | e96dea2cb0c6c07370889754d1608306957d601a | |
| parent | 0bcae127ca778bddd9ac6ad014157704bb38f498 (diff) | |
| parent | 9bb61af61e13def5300b6186e740f62a736c0f61 (diff) | |
Merge "Fix potential NPE in startHomeOnDisplay" into main
| -rw-r--r-- | services/core/java/com/android/server/wm/RootWindowContainer.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/RootWindowContainer.java b/services/core/java/com/android/server/wm/RootWindowContainer.java index 266fdbba0be7..41a580438776 100644 --- a/services/core/java/com/android/server/wm/RootWindowContainer.java +++ b/services/core/java/com/android/server/wm/RootWindowContainer.java @@ -1407,7 +1407,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> displayId = rootTask != null ? rootTask.getDisplayId() : DEFAULT_DISPLAY; } - final DisplayContent display = getDisplayContent(displayId); + final DisplayContent display = getDisplayContentOrCreate(displayId); return display.reduceOnAllTaskDisplayAreas((taskDisplayArea, result) -> result | startHomeOnTaskDisplayArea(userId, reason, taskDisplayArea, allowInstrumenting, fromHomeKey), |