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

am: 93c75d07c1 Change-Id: I5436618eb3ddd752a95caa5b0c427a3e32279a49
2016-10-13 14:17:59 +00:00
parent 7cbe133507 93c75d07c1
commit d975003af3
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
@@ -3157,7 +3157,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;
        }