Merge "Modify the case in adjustFocus when the mFocusedActivity is null" am: 80587da3c1 am: 93c75d07c1

am: d975003af3 Change-Id: If4ff1ee251842598f1a5e8dedb7858daed201206
2016-10-14 14:17:07 +00:00
parent 85f037acd0 d975003af3
commit 167f01a13a
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -3197,7 +3197,8 @@ final class ActivityStack {
    }

    private void adjustFocusedActivityLocked(ActivityRecord r, String reason) {
-        if (!mStackSupervisor.isFocusedStack(this) || mService.mFocusedActivity != r) {
+        if (!mStackSupervisor.isFocusedStack(this) || (mService.mFocusedActivity != r
+                && mService.mFocusedActivity != null)) {
            return;
        }