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

Merge "DO NOT MERGE ANYWHERE:Fix NPE during Activity transition using wrong Activity." into nyc-dr1-dev

Browse Source
This commit is contained in:
Adam Seaton
2016-08-21 21:18:03 +00:00
committed by Android (Google) Code Review
parent bab7c28e5e c9373e5505
commit 0f1e7ab1d3
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/app/ActivityTransitionState.java
View File

@@ -337,11 +337,12 @@ class ActivityTransitionState {
} }
public void startExitOutTransition(Activity activity, Bundle options) { 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; return;
} }
ActivityOptions activityOptions = new ActivityOptions(options); ActivityOptions activityOptions = new ActivityOptions(options);
mEnterTransitionCoordinator = null;
if (activityOptions.getAnimationType() == ActivityOptions.ANIM_SCENE_TRANSITION) { if (activityOptions.getAnimationType() == ActivityOptions.ANIM_SCENE_TRANSITION) {
int key = activityOptions.getExitCoordinatorKey(); int key = activityOptions.getExitCoordinatorKey();
int index = mExitTransitionCoordinators.indexOfKey(key); int index = mExitTransitionCoordinators.indexOfKey(key);