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

am 2051bded: am 53e2c6ec: am c0c8d198: Merge "[ActivityManager] Fix activity always visible."

Browse Source 
* commit '2051bded279f2d81e89b2a3731d1ba164ff9054a':
  [ActivityManager] Fix activity always visible.
This commit is contained in:
Olawale Ogunwale
2015-04-17 16:36:02 +00:00
committed by Android Git Automerger
parent f645f9420c 2051bded27
commit 5c75f0fbe3
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

@@ -808,8 +808,14 @@ final class ActivityStack {
final boolean startPausingLocked(boolean userLeaving, boolean uiSleeping, boolean resuming,
boolean dontWait) {
if (mPausingActivity != null) {
Slog.wtf(TAG, "Going to pause when pause is already pending for " + mPausingActivity);
completePauseLocked(false);
Slog.wtf(TAG, "Going to pause when pause is already pending for " + mPausingActivity
+ " 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;
if (prev == null) {