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

Commit b326fba2 authored by Hongwei Wang's avatar Hongwei Wang Committed by Automerger Merge Worker
Browse files

Merge "Put safeguard in dismissPip" into rvc-dev am: 114b422d am: d225fe54 am: 35c7ef20 

Change-Id: Id2d0c8755edb730b945ed81bebc3cd649a83239b
parents 9441d340 35c7ef20

packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java

+5 −0
Original line number Diff line number Diff line
@@ -238,6 +238,11 @@ public class PipTaskOrganizer extends TaskOrganizer { 
     * @param animationDurationMs duration in millisecond for the exiting PiP transition

     */

    public void dismissPip(int animationDurationMs) {

        if (!mInPip || mToken == null) {

            Log.wtf(TAG, "Not allowed to dismissPip in current state"

                    + " mInPip=" + mInPip + " mToken=" + mToken);

            return;

        }

        final WindowContainerTransaction wct = new WindowContainerTransaction();

        wct.setActivityWindowingMode(mToken, WINDOWING_MODE_UNDEFINED);

        WindowOrganizer.applyTransaction(wct);