Merge "Add null pointer check." into klp-dev

2013-11-14 00:15:55 +00:00
parent a951fa56f1 ada62fca51
commit 1f0f9fa949
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);
        }