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

Merge "[ActivityManager] Fix activity always visible."

Browse Source
This commit is contained in:
Olawale Ogunwale
2015-04-17 15:50:46 +00:00
committed by Gerrit Code Review
parent e386f7f510 7dfe4d7d85
commit c0c8d1983c
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -780,8 +780,14 @@ final class ActivityStack {
final boolean startPausingLocked(boolean userLeaving, boolean uiSleeping, boolean resuming, final boolean startPausingLocked(boolean userLeaving, boolean uiSleeping, boolean resuming,
boolean dontWait) { boolean dontWait) {
if (mPausingActivity != null) { if (mPausingActivity != null) {
Slog.wtf(TAG, "Going to pause when pause is already pending for " + mPausingActivity); Slog.wtf(TAG, "Going to pause when pause is already pending for " + mPausingActivity
completePauseLocked(false); + " state=" + mPausingActivity.state);
if (!mService.isSleeping()) {
// Avoid recursion among check for sleep and complete pause during sleeping.
// Because activity will be paused immediately after resume, just let pause
// be completed by the order of activity paused from clients.
completePauseLocked(false);
}
} }
ActivityRecord prev = mResumedActivity; ActivityRecord prev = mResumedActivity;
if (prev == null) { if (prev == null) {