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

Commit 9a1f0592 authored by Ikram Gabiyev's avatar Ikram Gabiyev Committed by Android (Google) Code Review
Browse files

Merge "Add log and return if invalid leash onThemeChange" into main

parents 2018da88 cf1cceb2

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

+9 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import android.graphics.Insets; 
import android.graphics.Point;

import android.graphics.Rect;

import android.os.Bundle;

import android.os.Debug;

import android.util.Log;

import android.view.SurfaceControl;

import android.window.DesktopExperienceFlags;
@@ -382,6 +383,14 @@ public class PipController implements ConfigurationChangeListener, 
        if (Flags.enablePipBoxShadows()) {

            if (mPipTransitionState.isInPip()) {

                SurfaceControl pipLeash = mPipTransitionState.getPinnedTaskLeash();

                if (pipLeash == null) {

                    // TODO (b/433316431): Remove once onThemeChange pip leash NPE is root-caused.

                    Log.wtf(TAG, String.format("""

                        PipTransitionState#isInPip()=true without a valid leash;

                        callers=%s""", Debug.getCallers(4)));

                    return;

                }



                mPipSurfaceTransactionHelper.onThemeChanged(mContext);

                SurfaceControl.Transaction tx = mSurfaceControlTransactionFactory.getTransaction();

                mPipSurfaceTransactionHelper.shadow(tx, pipLeash, true /* applyShadowRadius */);