diff options
| author | George Mount <mount@google.com> | 2016-08-18 22:27:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-08-18 22:27:31 +0000 |
| commit | 2613fb543a969b08a8477e03cdbf47ef93005dcd (patch) | |
| tree | fbc395ef0fdce417662ded0a5f17032548c25573 /core/java/android | |
| parent | 47c7a8c19a191f16940d0f4dec0d8d1b147637ad (diff) | |
| parent | a3edbf6a5d4698570f2b5610390b5c70251f52d7 (diff) | |
Merge "Fix NPE during Activity transition using wrong Activity." into nyc-mr1-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/ActivityTransitionState.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/app/ActivityTransitionState.java b/core/java/android/app/ActivityTransitionState.java index 221923821bbb..aef1d0c31f9d 100644 --- a/core/java/android/app/ActivityTransitionState.java +++ b/core/java/android/app/ActivityTransitionState.java @@ -337,11 +337,12 @@ class ActivityTransitionState { } public void startExitOutTransition(Activity activity, Bundle options) { - if (!activity.getWindow().hasFeature(Window.FEATURE_ACTIVITY_TRANSITIONS)) { + mEnterTransitionCoordinator = null; + if (!activity.getWindow().hasFeature(Window.FEATURE_ACTIVITY_TRANSITIONS) || + mExitTransitionCoordinators == null) { return; } ActivityOptions activityOptions = new ActivityOptions(options); - mEnterTransitionCoordinator = null; if (activityOptions.getAnimationType() == ActivityOptions.ANIM_SCENE_TRANSITION) { int key = activityOptions.getExitCoordinatorKey(); int index = mExitTransitionCoordinators.indexOfKey(key); |