Merge "Fix to NullPointerException on move back in ActivityStack."

2013-12-17 16:36:44 +00:00
parent 5d6332e374 9cdf9e52d9
commit f431daa228
1 changed files with 1 additions and 3 deletions
--- a/services/java/com/android/server/am/ActivityStack.java
+++ b/services/java/com/android/server/am/ActivityStack.java
@@ -3160,9 +3160,7 @@ final class ActivityStack {

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