Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 717c0ad2 authored by Vladimir Komsiyski's avatar Vladimir Komsiyski Committed by Android (Google) Code Review
Browse files

Merge "Fix potential NPE in startHomeOnDisplay" into main

parents 0bcae127 9bb61af6

services/core/java/com/android/server/wm/RootWindowContainer.java

+1 −1
Original line number Diff line number Diff line
@@ -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),