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

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

Merge "Fix BackNavigationControllerTests failure" into main

parents 90d765df 71b2b825

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

+2 −1
Original line number Diff line number Diff line
@@ -9275,7 +9275,8 @@ public class WindowManagerService extends IWindowManager.Stub 
        return !fromWin.isFocused();

    }



    private void moveFocusToActivity(@NonNull ActivityRecord activity) {

    @VisibleForTesting

    void moveFocusToActivity(@NonNull ActivityRecord activity) {

        moveDisplayToTopInternal(activity.getDisplayId());

        handleTaskFocusChange(activity.getTask(), activity);

    }

services/tests/wmtests/src/com/android/server/wm/BackNavigationControllerTests.java

+2 −3
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ import android.os.Bundle; 
import android.os.RemoteCallback;

import android.os.RemoteException;

import android.platform.test.annotations.Presubmit;

import android.platform.test.annotations.RequiresFlagsEnabled;

import android.util.ArraySet;

import android.view.WindowManager;

import android.window.BackAnimationAdapter;
@@ -632,8 +631,8 @@ public class BackNavigationControllerTests extends WindowTestsBase { 
    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_EMBEDDED_ACTIVITY_BACK_NAV_FLAG)

    public void testAdjacentFocusInActivityEmbedding() {

        mSetFlagsRule.enableFlags(Flags.FLAG_EMBEDDED_ACTIVITY_BACK_NAV_FLAG);

        Task task = createTask(mDefaultDisplay);

        TaskFragment primary = createTaskFragmentWithActivity(task);

        TaskFragment secondary = createTaskFragmentWithActivity(task);
@@ -645,7 +644,7 @@ public class BackNavigationControllerTests extends WindowTestsBase { 
        doReturn(primary).when(windowState).getTaskFragment();



        startBackNavigation();

        verify(mWm).moveFocusToAdjacentWindow(any(), anyInt());

        verify(mWm).moveFocusToActivity(any());

    }



    /**