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

Merge "Fix NPE in TvPipController" into sc-dev am: 03b61d22b6 am: 9d81fc0b69 am: 61da8bd6ce

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15156230

Change-Id: I42e5093f68c5d3069d1cc5788cad2c9abf77a630
This commit is contained in:
TreeHugger Robot
2021-07-02 22:46:44 +00:00
committed by Automerger Merge Worker
parent 97a9e05dac 61da8bd6ce
commit 6f4e5f03c4
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipController.java
View File

@@ -279,7 +279,7 @@ public class TvPipController implements PipTransitionController.PipTransitionCal
private void checkIfPinnedTaskAppeared() {
final TaskInfo pinnedTask = getPinnedTaskInfo();
if (DEBUG) Log.d(TAG, "checkIfPinnedTaskAppeared(), task=" + pinnedTask);
if (pinnedTask == null) return;
if (pinnedTask == null || pinnedTask.topActivity == null) return;
mPinnedTaskId = pinnedTask.taskId;
setState(STATE_PIP);