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

Commit 6f4e5f03 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE in TvPipController" into sc-dev am: 03b61d22 am: 9d81fc0b am: 61da8bd6 

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

Change-Id: I42e5093f68c5d3069d1cc5788cad2c9abf77a630
parents 97a9e05d 61da8bd6

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

+1 −1
Original line number Diff line number Diff line
@@ -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);