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

Commit 5f7e4003 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17800405



Change-Id: I845d6d2f3f6194eac32657917fdc04af7368d3d9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 70878f92 ff28c2a7

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