Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixed NPE in ActivityStarter.updateTaskReturnToType()"

Browse Source
This commit is contained in:
TreeHugger Robot
2016-11-17 20:31:51 +00:00
committed by Android (Google) Code Review
parent 972d866b53 cdc0ddca91
commit 61e5f71292
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/am/ActivityStarter.java
View File

@@ -1524,8 +1524,8 @@ class ActivityStarter {
private void updateTaskReturnToType(
TaskRecord task, int launchFlags, ActivityStack focusedStack) {
if (focusedStack != null && focusedStack.isHomeStack() &&
focusedStack.topTask().isOnTopLauncher()) {
if (focusedStack != null && focusedStack.isHomeStack() && focusedStack.topTask() != null
&& focusedStack.topTask().isOnTopLauncher()) {
// Since an on-top launcher will is moved to back when tasks are launched from it,
// those tasks should first try to return to a non-home activity.
// This also makes sure that non-home activities are visible under a transparent