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

* commit '29bbd570fe36c55321a3cd9d84330dea9d2f1e10': Add null pointer check.
2013-11-13 16:23:38 -08:00
parent 3857dbe11c 29bbd570fe
commit 1fbb5da29a
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);
        }