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

Commit ad575095 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by android-build-merger
Browse files

Merge "Don\'t show home activity when exiting split-screen with recents visible" into nyc-dev 

am: 5e3801ab

* commit '5e3801ab':
  Don't show home activity when exiting split-screen with recents visible
parents 62c01e37 5e3801ab

services/core/java/com/android/server/am/ActivityStack.java

+6 −2
Original line number Diff line number Diff line
@@ -3089,10 +3089,14 @@ final class ActivityStack { 
            return false;

        }



        if (stack.isHomeStack()) {

        final ActivityRecord top = stack.topRunningActivityLocked();



        if (stack.isHomeStack() && (top == null || !top.visible)) {

            // If we will be focusing on the home stack next and its current top activity isn't

            // visible, then use the task return to value to determine the home task to display next.

            return mStackSupervisor.moveHomeStackTaskToTop(taskToReturnTo, reason);

        }

        return mService.setFocusedActivityLocked(stack.topRunningActivityLocked(), myReason);

        return mService.setFocusedActivityLocked(top, myReason);

    }



    final void stopActivityLocked(ActivityRecord r) {