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

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

Merge "Log terrible failure on null PiP task token" into main

parents e9264159 9654cfd8

libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipController.java

+9 −1
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ import android.content.pm.ActivityInfo; 
import android.content.res.Configuration;

import android.graphics.Rect;

import android.os.Bundle;

import android.os.Debug;

import android.util.Log;

import android.view.SurfaceControl;

import android.window.DesktopExperienceFlags;

import android.window.DisplayAreaInfo;
@@ -369,7 +371,13 @@ public class PipController implements ConfigurationChangeListener, 
            mPipBoundsAlgorithm.applySnapFraction(toBounds, snapFraction);

            mPipBoundsState.setBounds(toBounds);

        }

        if (mPipTransitionState.getPipTaskToken() == null) {

            Log.wtf(TAG, "PipController.onDisplayChange no PiP task token"

                    + " state=" + mPipTransitionState.getState()

                    + " callers=\n" + Debug.getCallers(4, "    "));

        } else {

            t.setBounds(mPipTransitionState.getPipTaskToken(), mPipBoundsState.getBounds());

        }

        // Update the size spec in PipBoundsState afterwards.

        mPipBoundsState.updateMinMaxSize(mPipBoundsState.getAspectRatio());

    }