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

Commit ddd99bb7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Dump log when trying to launch overlay from split" into main

parents 7b361115 c8c798bb
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -2725,15 +2725,19 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen
    TaskFragmentContainer createOrUpdateOverlayTaskFragmentIfNeeded(
            @NonNull WindowContainerTransaction wct, @NonNull Bundle options,
            @NonNull Intent intent, @NonNull Activity launchActivity) {
        final String overlayTag = Objects.requireNonNull(options.getString(KEY_OVERLAY_TAG));
        if (isActivityFromSplit(launchActivity)) {
            // We restrict to launch the overlay from split. Fallback to treat it as normal
            // launch.
            Log.w(TAG, "It's not allowed to launch overlay container with tag=" + overlayTag
                    + " from activity in Activity Embedding split."
                    + " Launching activity=" + launchActivity
                    + " Fallback to launch the activity as normal launch.");
            return null;
        }

        final List<TaskFragmentContainer> overlayContainers =
                getAllNonFinishingOverlayContainers();
        final String overlayTag = Objects.requireNonNull(options.getString(KEY_OVERLAY_TAG));
        final boolean associateLaunchingActivity = options
                .getBoolean(KEY_OVERLAY_ASSOCIATE_WITH_LAUNCHING_ACTIVITY, true);