drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[ActivityManager] Finish the failed-to-pause activity"

Browse Source
This commit is contained in:
Olawale Ogunwale
2015-04-08 12:51:11 +00:00
committed by Gerrit Code Review
parent 80e455e325 047dfd40fd
commit 1bdbce295c
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -899,6 +899,11 @@ final class ActivityStack {
r.userId, System.identityHashCode(r), r.shortComponentName, r.userId, System.identityHashCode(r), r.shortComponentName,
mPausingActivity != null mPausingActivity != null
? mPausingActivity.shortComponentName : "(none)"); ? mPausingActivity.shortComponentName : "(none)");
if (r.finishing && r.state == ActivityState.PAUSING) {
if (DEBUG_PAUSE) Slog.v(TAG,
"Executing finish of failed to pause activity: " + r);
finishCurrentActivityLocked(r, FINISH_AFTER_VISIBLE, false);
}
} }
} }
} }