Add null pointer check.

Fixes bug 11673948. Change-Id: I60b590b9793ae1b8d5c3d343f4bb6cb40ba4a092
2013-11-13 15:06:15 -08:00
parent 48dab493b9
commit ada62fca51
1 changed files with 3 additions and 1 deletions
--- a/services/java/com/android/server/am/ActivityStack.java
+++ b/services/java/com/android/server/am/ActivityStack.java
@@ -3158,7 +3158,9 @@ final class ActivityStack {

        final TaskRecord task = mResumedActivity != null ? mResumedActivity.task : null;
        if (task == tr && task.mOnTopOfHome || numTasks <= 1) {
-            task.mOnTopOfHome = false;
+            if (task != null) {
+                task.mOnTopOfHome = false;
+            }
            return mStackSupervisor.resumeHomeActivity(null);
        }