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

Commit 8971bb34 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Fixes un-setting activity type when embed activity in... 

Merge "Merge "Fixes un-setting activity type when embed activity in split-screen" into tm-dev am: 0fb7a128 am: ff28c2a7"
parents 73712159 5f7e4003

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

+2 −1
Original line number Diff line number Diff line
@@ -2156,7 +2156,8 @@ class TaskFragment extends WindowContainer<WindowContainer> { 
        if (applicationType != ACTIVITY_TYPE_UNDEFINED || !hasChild()) {

            return applicationType;

        }

        return getTopChild().getActivityType();

        final ActivityRecord activity = getTopNonFinishingActivity();

        return activity != null ? activity.getActivityType() : getTopChild().getActivityType();

    }



    @Override