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

Commit 0df7f453 authored by Hongwei Wang's avatar Hongwei Wang Committed by Android (Google) Code Review
Browse files

Merge "Bail early if mToken.asBinder() not found"

parents 8993c13c e4489b4c

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

+5 −1
Original line number Original line Diff line number Diff line
@@ -325,9 +325,13 @@ public class PipTaskOrganizer extends TaskOrganizer implements ShellTaskOrganize 
            return;

            return;

        }

        }





        final Configuration initialConfig = mInitialState.remove(mToken.asBinder());

        if (initialConfig == null) {

            Log.wtf(TAG, "Token not in record, this should not happen mToken=" + mToken);

            return;

        }

        mPipUiEventLoggerLogger.log(

        mPipUiEventLoggerLogger.log(

                PipUiEventLogger.PipUiEventEnum.PICTURE_IN_PICTURE_EXPAND_TO_FULLSCREEN);

                PipUiEventLogger.PipUiEventEnum.PICTURE_IN_PICTURE_EXPAND_TO_FULLSCREEN);

        final Configuration initialConfig = mInitialState.remove(mToken.asBinder());

        final boolean orientationDiffers = initialConfig.windowConfiguration.getRotation()

        final boolean orientationDiffers = initialConfig.windowConfiguration.getRotation()

                != mPipBoundsHandler.getDisplayRotation();

                != mPipBoundsHandler.getDisplayRotation();

        final WindowContainerTransaction wct = new WindowContainerTransaction();

        final WindowContainerTransaction wct = new WindowContainerTransaction();