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

Commit 782f88ad authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Disallow onExitPipFinished() from being called multiple times" into... 

Merge "Disallow onExitPipFinished() from being called multiple times" into tm-qpr-dev am: b3728bc5

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19418033



Change-Id: I2b8b758e35af7068ce33311aedccebbe42534668
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a7237057 b3728bc5

libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java

+7 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ import android.content.res.Configuration; 
import android.graphics.Rect;

import android.os.RemoteException;

import android.os.SystemClock;

import android.util.Log;

import android.view.Display;

import android.view.Surface;

import android.view.SurfaceControl;
@@ -930,6 +931,12 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, 


    /** Called when exiting PIP transition is finished to do the state cleanup. */

    void onExitPipFinished(TaskInfo info) {

        if (mLeash == null) {

            // TODO(239461594): Remove once the double call to onExitPipFinished() is fixed

            Log.w(TAG, "Warning, onExitPipFinished() called multiple times in the same sessino");

            return;

        }



        clearWaitForFixedRotation();

        if (mSwipePipToHomeOverlay != null) {

            removeContentOverlay(mSwipePipToHomeOverlay, null /* callback */);

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/PipTaskOrganizerTest.java

+9 −8
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import android.testing.TestableLooper; 
import android.util.Rational;

import android.util.Size;

import android.view.DisplayInfo;

import android.view.SurfaceControl;

import android.window.WindowContainerToken;



import com.android.wm.shell.MockSurfaceControlHelper;
@@ -150,7 +151,7 @@ public class PipTaskOrganizerTest extends ShellTestCase { 
        final Rational aspectRatio = new Rational(2, 1);



        mSpiedPipTaskOrganizer.onTaskAppeared(createTaskInfo(mComponent1,

                createPipParams(aspectRatio)), null /* leash */);

                createPipParams(aspectRatio)), mock(SurfaceControl.class));



        assertEquals(aspectRatio.floatValue(), mPipBoundsState.getAspectRatio(), 0.01f);

    }
@@ -158,7 +159,7 @@ public class PipTaskOrganizerTest extends ShellTestCase { 
    @Test

    public void onTaskAppeared_updatesLastPipComponentName() {

        mSpiedPipTaskOrganizer.onTaskAppeared(createTaskInfo(mComponent1, createPipParams(null)),

                null /* leash */);

                mock(SurfaceControl.class));



        assertEquals(mComponent1, mPipBoundsState.getLastPipComponentName());

    }
@@ -169,7 +170,7 @@ public class PipTaskOrganizerTest extends ShellTestCase { 


        mSpiedPipTaskOrganizer.onTaskAppeared(

                createTaskInfo(mComponent1, createPipParams(null), minSize),

                null /* leash */);

                mock(SurfaceControl.class));



        assertEquals(minSize, mPipBoundsState.getOverrideMinSize());

    }
@@ -179,7 +180,7 @@ public class PipTaskOrganizerTest extends ShellTestCase { 
        final Rational startAspectRatio = new Rational(2, 1);

        final Rational newAspectRatio = new Rational(1, 2);

        mSpiedPipTaskOrganizer.onTaskAppeared(createTaskInfo(mComponent1,

                createPipParams(startAspectRatio)), null /* leash */);

                createPipParams(startAspectRatio)), mock(SurfaceControl.class));



        // It is in entering transition, should defer onTaskInfoChanged callback in this case.

        mSpiedPipTaskOrganizer.onTaskInfoChanged(createTaskInfo(mComponent1,
@@ -197,7 +198,7 @@ public class PipTaskOrganizerTest extends ShellTestCase { 
        final Rational startAspectRatio = new Rational(2, 1);

        final Rational newAspectRatio = new Rational(1, 2);

        mSpiedPipTaskOrganizer.onTaskAppeared(createTaskInfo(mComponent1,

                createPipParams(startAspectRatio)), null /* leash */);

                createPipParams(startAspectRatio)), mock(SurfaceControl.class));

        mSpiedPipTaskOrganizer.sendOnPipTransitionFinished(TRANSITION_DIRECTION_TO_PIP);



        mSpiedPipTaskOrganizer.onTaskInfoChanged(createTaskInfo(mComponent1,
@@ -210,7 +211,7 @@ public class PipTaskOrganizerTest extends ShellTestCase { 
    @Test

    public void onTaskInfoChanged_inPip_updatesLastPipComponentName() {

        mSpiedPipTaskOrganizer.onTaskAppeared(createTaskInfo(mComponent1,

                createPipParams(null)), null /* leash */);

                createPipParams(null)), mock(SurfaceControl.class));

        mSpiedPipTaskOrganizer.sendOnPipTransitionFinished(TRANSITION_DIRECTION_TO_PIP);



        mSpiedPipTaskOrganizer.onTaskInfoChanged(createTaskInfo(mComponent2,
@@ -222,7 +223,7 @@ public class PipTaskOrganizerTest extends ShellTestCase { 
    @Test

    public void onTaskInfoChanged_inPip_updatesOverrideMinSize() {

        mSpiedPipTaskOrganizer.onTaskAppeared(createTaskInfo(mComponent1,

                createPipParams(null)), null /* leash */);

                createPipParams(null)), mock(SurfaceControl.class));

        mSpiedPipTaskOrganizer.sendOnPipTransitionFinished(TRANSITION_DIRECTION_TO_PIP);



        final Size minSize = new Size(400, 320);
@@ -235,7 +236,7 @@ public class PipTaskOrganizerTest extends ShellTestCase { 
    @Test

    public void onTaskVanished_clearsPipBounds() {

        mSpiedPipTaskOrganizer.onTaskAppeared(createTaskInfo(mComponent1,

                createPipParams(null)), null /* leash */);

                createPipParams(null)), mock(SurfaceControl.class));

        mPipBoundsState.setBounds(new Rect(100, 100, 200, 150));



        mSpiedPipTaskOrganizer.onTaskVanished(createTaskInfo(mComponent1, createPipParams(null)));