am 1f0f9fa9: Merge "Add null pointer check." into klp-dev

* commit '1f0f9fa94913198cd79b8d350cf9e8df8001daeb': Add null pointer check.
2013-11-13 16:20:02 -08:00
parent af49ff8c39 1f0f9fa949
commit 29bbd570fe
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
@@ -3160,7 +3160,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);
        }