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

Commit c259b94c authored by Winson Chung's avatar Winson Chung Committed by android-build-merger
Browse files

Merge "Fix crash when deleting task" into oc-dev am: c6fa8ee0 

am: b2a93b69

Change-Id: Ic50927eed7d9f2a0a1a8e4c70118e3fbe633e081
parents c0eddd36 b2a93b69

packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java

+8 −3
Original line number Original line Diff line number Diff line
@@ -133,6 +133,7 @@ public class TaskView extends FixedSizeFrameLayout implements Task.TaskCallbacks 




    @ViewDebug.ExportedProperty(deepExport=true, prefix="task_")

    @ViewDebug.ExportedProperty(deepExport=true, prefix="task_")

    private Task mTask;

    private Task mTask;

    private boolean mTaskBound;

    @ViewDebug.ExportedProperty(category="recents")

    @ViewDebug.ExportedProperty(category="recents")

    private boolean mClipViewInStack = true;

    private boolean mClipViewInStack = true;

    @ViewDebug.ExportedProperty(category="recents")

    @ViewDebug.ExportedProperty(category="recents")
@@ -607,6 +608,7 @@ public class TaskView extends FixedSizeFrameLayout implements Task.TaskCallbacks 
        SystemServicesProxy ssp = Recents.getSystemServices();

        SystemServicesProxy ssp = Recents.getSystemServices();

        mTouchExplorationEnabled = touchExplorationEnabled;

        mTouchExplorationEnabled = touchExplorationEnabled;

        mTask = t;

        mTask = t;

        mTaskBound = true;

        mTask.addCallback(this);

        mTask.addCallback(this);

        mIsDisabledInSafeMode = !mTask.isSystemApp && ssp.isInSafeMode();

        mIsDisabledInSafeMode = !mTask.isSystemApp && ssp.isInSafeMode();

        mThumbnailView.bindToTask(mTask, mIsDisabledInSafeMode, displayOrientation, displayRect);

        mThumbnailView.bindToTask(mTask, mIsDisabledInSafeMode, displayOrientation, displayRect);
@@ -627,10 +629,12 @@ public class TaskView extends FixedSizeFrameLayout implements Task.TaskCallbacks 




    @Override

    @Override

    public void onTaskDataLoaded(Task task, ThumbnailData thumbnailData) {

    public void onTaskDataLoaded(Task task, ThumbnailData thumbnailData) {

        if (mTaskBound) {

            // Update each of the views to the new task data

            // Update each of the views to the new task data

            mThumbnailView.onTaskDataLoaded(thumbnailData);

            mThumbnailView.onTaskDataLoaded(thumbnailData);

            mHeaderView.onTaskDataLoaded();

            mHeaderView.onTaskDataLoaded();

        }

        }

    }





    @Override

    @Override

    public void onTaskDataUnloaded() {

    public void onTaskDataUnloaded() {
@@ -638,6 +642,7 @@ public class TaskView extends FixedSizeFrameLayout implements Task.TaskCallbacks 
        mTask.removeCallback(this);

        mTask.removeCallback(this);

        mThumbnailView.unbindFromTask();

        mThumbnailView.unbindFromTask();

        mHeaderView.unbindFromTask(mTouchExplorationEnabled);

        mHeaderView.unbindFromTask(mTouchExplorationEnabled);

        mTaskBound = false;

    }

    }





    @Override

    @Override