Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Work around for NPE with shell transition" into tm-qpr-dev

Browse Source
This commit is contained in:
Hongwei Wang
2023-03-11 06:06:23 +00:00
committed by Android (Google) Code Review
parent 103b84b290 dc02781bef
commit 6911cccd49
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransition.java
View File

@@ -803,8 +803,15 @@ public class PipTransition extends PipTransitionController {
if (sourceHintRect == null) { if (sourceHintRect == null) {
// We use content overlay when there is no source rect hint to enter PiP use bounds // We use content overlay when there is no source rect hint to enter PiP use bounds
// animation. // animation.
// TODO(b/272819817): cleanup the null-check and extra logging.
final boolean hasTopActivityInfo = taskInfo.topActivityInfo != null;
if (!hasTopActivityInfo) {
ProtoLog.w(ShellProtoLogGroup.WM_SHELL_TRANSITIONS,
"%s: TaskInfo.topActivityInfo is null", TAG);
}
if (SystemProperties.getBoolean( if (SystemProperties.getBoolean(
"persist.wm.debug.enable_pip_app_icon_overlay", true)) { "persist.wm.debug.enable_pip_app_icon_overlay", true)
&& hasTopActivityInfo) {
animator.setAppIconContentOverlay( animator.setAppIconContentOverlay(
mContext, currentBounds, taskInfo.topActivityInfo); mContext, currentBounds, taskInfo.topActivityInfo);
} else { } else {