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

Merge "Recording activity notification: return list of configuration" into nyc-dev am: c991879f29

Browse Source 
am: 7399079b5b

* commit '7399079b5b6af59aceba6c4a4070fdf7afe432c0':
  Only resuming starting dontWaitForPause activity once

Change-Id: I28a1b0fb32c521ae990e96375fdb819dc12c95ca
This commit is contained in:
Jean-Michel Trivi
2016-05-23 21:10:26 +00:00
committed by android-build-merger
parent 6252410588 7399079b5b
commit a46586637d
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2258,6 +2258,20 @@ final class ActivityStack {
}
if (DEBUG_STACK) mStackSupervisor.validateTopActivitiesLocked();
return true;
} else if (mResumedActivity == next && next.state == ActivityState.RESUMED &&
mStackSupervisor.allResumedActivitiesComplete()) {
// It is possible for the activity to be resumed when we paused back stacks above if the
// next activity doesn't have to wait for pause to complete.
// So, nothing else to-do except:
// Make sure we have executed any pending transitions, since there
// should be nothing left to do at this point.
mWindowManager.executeAppTransition();
mNoAnimActivities.clear();
ActivityOptions.abort(options);
if (DEBUG_STATES) Slog.d(TAG_STATES,
"resumeTopActivityLocked: Top activity resumed (dontWaitForPause) " + next);
if (DEBUG_STACK) mStackSupervisor.validateTopActivitiesLocked();
return true;
}
// If the most recent activity was noHistory but was only stopped rather