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

Commit 86df2c57 authored by Yuncheol Heo's avatar Yuncheol Heo
Browse files

Fix NPE in TaskView. 

- TaskInfo can be null before Listener is executed.

Bug: 178710250
Test: atest CarDevicePolicyManagerTest
Change-Id: I90cd57dbd01692b86924ec1b762e31f91a6cd6e0
parent 9b9486eb

libs/WindowManager/Shell/src/com/android/wm/shell/TaskView.java

+9 −4
Original line number Diff line number Diff line
@@ -225,8 +225,9 @@ public class TaskView extends SurfaceView implements SurfaceHolder.Callback, 
        mTaskOrganizer.applyTransaction(wct);

        // TODO(b/151449487): Only call callback once we enable synchronization

        if (mListener != null) {

            final int taskId = mTaskInfo.taskId;

            mListenerExecutor.execute(() -> {

                mListener.onTaskVisibilityChanged(mTaskInfo.taskId, mSurfaceCreated);

                mListener.onTaskVisibilityChanged(taskId, mSurfaceCreated);

            });

        }

    }
@@ -256,8 +257,10 @@ public class TaskView extends SurfaceView implements SurfaceHolder.Callback, 
        }



        if (mListener != null) {

            final int taskId = taskInfo.taskId;

            final ComponentName baseActivity = taskInfo.baseActivity;

            mListenerExecutor.execute(() -> {

                mListener.onTaskCreated(taskInfo.taskId, taskInfo.baseActivity);

                mListener.onTaskCreated(taskId, baseActivity);

            });

        }

    }
@@ -267,8 +270,9 @@ public class TaskView extends SurfaceView implements SurfaceHolder.Callback, 
        if (mTaskToken == null || !mTaskToken.equals(taskInfo.token)) return;



        if (mListener != null) {

            final int taskId = taskInfo.taskId;

            mListenerExecutor.execute(() -> {

                mListener.onTaskRemovalStarted(taskInfo.taskId);

                mListener.onTaskRemovalStarted(taskId);

            });

        }

        mTaskOrganizer.setInterceptBackPressedOnTaskRoot(mTaskToken, false);
@@ -289,8 +293,9 @@ public class TaskView extends SurfaceView implements SurfaceHolder.Callback, 
    public void onBackPressedOnTaskRoot(ActivityManager.RunningTaskInfo taskInfo) {

        if (mTaskToken == null || !mTaskToken.equals(taskInfo.token)) return;

        if (mListener != null) {

            final int taskId = taskInfo.taskId;

            mListenerExecutor.execute(() -> {

                mListener.onBackPressedOnTaskRoot(taskInfo.taskId);

                mListener.onBackPressedOnTaskRoot(taskId);

            });

        }

    }