diff options
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipController.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipController.java index 19428ee39919..e309da10864d 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipController.java @@ -99,7 +99,7 @@ public class PipController implements ConfigurationChangeListener, private final List<Consumer<Boolean>> mOnIsInPipStateChangedListeners = new ArrayList<>(); // Wrapper for making Binder calls into PiP animation listener hosted in launcher's Recents. - private PipAnimationListener mPipRecentsAnimationListener; + @Nullable private PipAnimationListener mPipRecentsAnimationListener; @VisibleForTesting interface PipAnimationListener { @@ -378,7 +378,9 @@ public class PipController implements ConfigurationChangeListener, tx.setLayer(overlay, Integer.MAX_VALUE); tx.apply(); } - mPipRecentsAnimationListener.onPipAnimationStarted(); + if (mPipRecentsAnimationListener != null) { + mPipRecentsAnimationListener.onPipAnimationStarted(); + } } private void setLauncherKeepClearAreaHeight(boolean visible, int height) { |