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

Commit a205547d authored by Jacqueline Bronger's avatar Jacqueline Bronger
Browse files

Fix NPE in TvPipController 

Test: atest android.accessibilityservice.cts.AccessibilityWindowReportingTest#putWindowInPictureInPicture_generatesEventAndReportsProperty
Bug: 189418438
Change-Id: I28e5eb78dcade1c83ee53ed88bee84834e618615
parent d8c85479

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -279,7 +279,7 @@ public class TvPipController implements PipTransitionController.PipTransitionCal 
    private void checkIfPinnedTaskAppeared() {

    private void checkIfPinnedTaskAppeared() {

        final TaskInfo pinnedTask = getPinnedTaskInfo();

        final TaskInfo pinnedTask = getPinnedTaskInfo();

        if (DEBUG) Log.d(TAG, "checkIfPinnedTaskAppeared(), task=" + pinnedTask);

        if (DEBUG) Log.d(TAG, "checkIfPinnedTaskAppeared(), task=" + pinnedTask);

        if (pinnedTask == null) return;

        if (pinnedTask == null || pinnedTask.topActivity == null) return;

        mPinnedTaskId = pinnedTask.taskId;

        mPinnedTaskId = pinnedTask.taskId;

        setState(STATE_PIP);

        setState(STATE_PIP);