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

Merge "Ensure state transition of paused activity." am: c2b9c5388a

Browse Source 
am: 11695e8081

* commit '11695e8081b269d489b5b4cc0b0c2075baeebc9b':
  Ensure state transition of paused activity.
This commit is contained in:
Wale Ogunwale
2015-10-21 16:33:25 +00:00
committed by android-build-merger
parent da0905f120 11695e8081
commit 8d16a3ddea
1 changed files with 7 additions and 4 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

@@ -941,7 +941,9 @@ 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 (r.state == ActivityState.PAUSING) {
r.state = ActivityState.PAUSED;
if (r.finishing) {
if (DEBUG_PAUSE) Slog.v(TAG, if (DEBUG_PAUSE) Slog.v(TAG,
"Executing finish of failed to pause activity: " + r); "Executing finish of failed to pause activity: " + r);
finishCurrentActivityLocked(r, FINISH_AFTER_VISIBLE, false); finishCurrentActivityLocked(r, FINISH_AFTER_VISIBLE, false);
@@ -949,6 +951,7 @@ final class ActivityStack {
} }
} }
} }
}
final void activityStoppedLocked(ActivityRecord r, Bundle icicle, final void activityStoppedLocked(ActivityRecord r, Bundle icicle,
PersistableBundle persistentState, CharSequence description) { PersistableBundle persistentState, CharSequence description) {