summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Perry Wu <wuperry@google.com> 2024-11-12 17:39:21 +0000
committer Perry Wu <wuperry@google.com> 2024-11-12 22:10:19 +0000
commit9b30bb6dbcce9415a6a503468bf83756deb050d7 (patch)
tree23e350525122837f0cbd010364d32d370273ddc5
parent4b817c8fecf1fa4c6aadaa6ad2ab38916e53aa6d (diff)
[PIP2] Fix NPE crash when entering Maps
Adds null checks for entering Maps pip. Flag: com.android.wm.shell.enable_pip2 Bug: 378124752 Test: manually enter maps pip Change-Id: Ie746c80d14257ed50f1de16acb1a1796cc513bf8
-rw-r--r--libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTransition.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTransition.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTransition.java
index 3caad0966b1f..f320f9eed08b 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTransition.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTransition.java
@@ -420,7 +420,8 @@ public class PipTransition extends PipTransitionController implements
}
// Update the src-rect-hint in params in place, to set up initial animator transform.
- params.getSourceRectHint().set(adjustedSourceRectHint);
+ params.copyOnlySet(new PictureInPictureParams.Builder()
+ .setSourceRectHint(adjustedSourceRectHint).build());
// Config-at-end transitions need to have their activities transformed before starting
// the animation; this makes the buffer seem like it's been updated to final size.