Merge "Removed improper check on mCalledExitCoordinator." into nyc-dev

This commit is contained in:
George Mount
2016-04-01 23:06:57 +00:00
committed by Android (Google) Code Review

View File

@@ -239,9 +239,6 @@ class ActivityTransitionState {
public void onResume(Activity activity, boolean isTopOfTask) {
// After orientation change, the onResume can come in before the top Activity has
// left, so if the Activity is not top, wait a second for the top Activity to exit.
if (mCalledExitCoordinator == null) {
return; // This is the called activity
}
if (isTopOfTask || mEnterTransitionCoordinator == null) {
restoreExitedViews();
restoreReenteringViews();