Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Modify the case in adjustFocus when the mFocusedActivity is null"

Browse Source
This commit is contained in:
Treehugger Robot
2016-10-10 20:20:56 +00:00
committed by Gerrit Code Review
parent 66f15cc01b 75685f7437
commit 80587da3c1
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/am/ActivityStack.java
View File

@@ -3157,7 +3157,8 @@ final class ActivityStack {
} }
private void adjustFocusedActivityLocked(ActivityRecord r, String reason) { 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; return;
} }