diff options
| author | Olawale Ogunwale <ogunwale@google.com> | 2015-04-08 13:09:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-08 13:09:42 +0000 |
| commit | 380415b6431adeb8138bc328a926807b8ae41df9 (patch) | |
| tree | 17f364cd8160ab0e1514c06365d242736afceb17 /services | |
| parent | e4d787b277a4b9435688c7e6f380bfc367751f76 (diff) | |
| parent | 1bdbce295cd7978e50b5444420ed222ec6c6281c (diff) | |
| download | frameworks_base-380415b6431adeb8138bc328a926807b8ae41df9.zip frameworks_base-380415b6431adeb8138bc328a926807b8ae41df9.tar.gz frameworks_base-380415b6431adeb8138bc328a926807b8ae41df9.tar.bz2 | |
am 1bdbce29: Merge "[ActivityManager] Finish the failed-to-pause activity"
* commit '1bdbce295cd7978e50b5444420ed222ec6c6281c':
[ActivityManager] Finish the failed-to-pause activity
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityStack.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java index daa3891..ada16e7 100644 --- a/services/core/java/com/android/server/am/ActivityStack.java +++ b/services/core/java/com/android/server/am/ActivityStack.java @@ -899,6 +899,11 @@ final class ActivityStack { r.userId, System.identityHashCode(r), r.shortComponentName, mPausingActivity != null ? 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); + } } } } |