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

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

Browse Source 
* commit '53e2c6ec87e6969b5f0db2ab92a9fa133317bd29':
  [ActivityManager] Fix activity always visible.
This commit is contained in:
Olawale Ogunwale
2015-04-17 16:23:40 +00:00
committed by Android Git Automerger
parent 14e24b4b44 53e2c6ec87
commit 2051bded27
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -780,9 +780,15 @@ 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
+ " 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); completePauseLocked(false);
} }
}
ActivityRecord prev = mResumedActivity; ActivityRecord prev = mResumedActivity;
if (prev == null) { if (prev == null) {
if (!resuming) { if (!resuming) {