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

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

Merge "Fixes the top activity not getting the focus by default" into main

parents 464e2750 e9ef4cf3

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

+1 −1
Original line number Diff line number Diff line
@@ -5232,7 +5232,6 @@ class Task extends TaskFragment { 


        final boolean[] resumed = new boolean[1];

        final TaskFragment topFragment = topActivity.getTaskFragment();

        resumed[0] = topFragment.resumeTopActivity(prev, options, deferPause);

        forAllLeafTaskFragments(f -> {

            if (topFragment == f) {

                return;
@@ -5242,6 +5241,7 @@ class Task extends TaskFragment { 
            }

            resumed[0] |= f.resumeTopActivity(prev, options, deferPause);

        }, true);

        resumed[0] |= topFragment.resumeTopActivity(prev, options, deferPause);

        return resumed[0];

    }