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

am 1bdbce29: Merge "[ActivityManager] Finish the failed-to-pause activity"

Browse Source 
* commit '1bdbce295cd7978e50b5444420ed222ec6c6281c':
  [ActivityManager] Finish the failed-to-pause activity
This commit is contained in:
Olawale Ogunwale
2015-04-08 13:09:42 +00:00
committed by Android Git Automerger
parent e4d787b277 1bdbce295c
commit 380415b643
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,
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);
}
}
}
}