Merge "Fix a regression in BNC search previous activity inside task." into main (7ed4970d) · Commits · e / os / android_frameworks_base

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

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -430,10 +430,10 @@ class BackNavigationController {
	if (prevTFAdjacent != null) {		if (prevTFAdjacent != null) {
	if (prevTFAdjacent == currTF) {		if (prevTFAdjacent == currTF) {
	outPrevActivities.clear();		outPrevActivities.clear();
	// No more activity in previous task fragment, so it can predict if previous		// No more activity in task, so it can predict if previous task exists.
	// task exists. Otherwise, unable to predict what will happen when app receive		// Otherwise, unable to predict what will happen when app receive
	// back key, skip animation.		// back key, skip animation.
	return prevTF.getActivity((below) -> !below.finishing, prevActivity,		return currentTask.getActivity((below) -> !below.finishing, prevActivity,
	false /includeBoundary/, true /traverseTopToBottom/) == null;		false /includeBoundary/, true /traverseTopToBottom/) == null;
	} else {		} else {
	final ActivityRecord prevActivityAdjacent =		final ActivityRecord prevActivityAdjacent =