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

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

Browse Source 
am: 1747022

* commit '1747022004c55a823d892f78a03952571d7e3c2b':
  Removed improper check on mCalledExitCoordinator.

Change-Id: Idc64dc39fe704e382f598ca6102e452e079c6859
This commit is contained in:
George Mount
2016-04-01 23:19:10 +00:00
committed by android-build-merger
parent c6eaac81ed 1747022004
commit 5e61e92f11
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/app/ActivityTransitionState.java
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();