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

Commit 879475f3 authored by Louis Chang's avatar Louis Chang Committed by Android (Google) Code Review
Browse files

Merge "Fixes NPE when getting the source task" into main

parents c19f35d9 44c616a6

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

+1 −1
Original line number Diff line number Diff line
@@ -423,7 +423,7 @@ class TaskLaunchParamsModifier implements LaunchParamsModifier { 
    private boolean canInheritWindowingModeFromSource(@NonNull DisplayContent display,

            TaskDisplayArea suggestedDisplayArea, @Nullable ActivityRecord source,

            @Nullable Task targetTask) {

        if (source == null) {

        if (source == null || source.getTask() == null) {

            return false;

        }