summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorGeorge Mount <mount@google.com>2016-04-01 13:19:35 -0700
committerGeorge Mount <mount@google.com>2016-04-01 13:19:35 -0700
commit056b7d5403cffeea4ae5693fb4565715efeb4eec (patch)
tree300174375f7a380bc3bf28b75cb883c4257bdebd /core/java
parent1b8189d825746ff7d786c28ecf69abbd481e7b05 (diff)
Removed improper check on mCalledExitCoordinator.
Bug 27969302 mCalledExitCoordinator can be nulled before the onResume is called, so it cannot be used to determine whether or not the Activity is a caller or called. Change-Id: Ie3696ed59b89cfc8c6145d22bc230111f0813701
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/app/ActivityTransitionState.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/core/java/android/app/ActivityTransitionState.java b/core/java/android/app/ActivityTransitionState.java
index d3ca7eebdfcd..4a1aff74ddf6 100644
--- a/core/java/android/app/ActivityTransitionState.java
+++ b/core/java/android/app/ActivityTransitionState.java
@@ -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();