Merge "prevent crash with pin protected user and taskview" into tm-qpr-dev
This commit is contained in:
@@ -1222,7 +1222,7 @@ final class TaskDisplayArea extends DisplayArea<WindowContainer> {
|
|||||||
|
|
||||||
// Clear last paused activity if focused root task changed while sleeping, so that the
|
// Clear last paused activity if focused root task changed while sleeping, so that the
|
||||||
// top activity of current focused task can be resumed.
|
// top activity of current focused task can be resumed.
|
||||||
if (mDisplayContent.isSleeping()) {
|
if (mDisplayContent.isSleeping() && currentFocusedTask != null) {
|
||||||
currentFocusedTask.clearLastPausedActivity();
|
currentFocusedTask.clearLastPausedActivity();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user