Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00dde0bd authored by George Mount's avatar George Mount
Browse files

Fix hang when there is no shared element in activity transition. 

Bug 15990826

Change-Id: Id494a51baf8694abd6c5207389cd8334db485d1a
parent 5654e2ba

core/java/android/app/ActivityOptions.java

+1 −4
Original line number Diff line number Diff line
@@ -578,9 +578,9 @@ public class ActivityOptions { 
        mResultData = null;

        mResultCode = 0;

        mExitCoordinatorIndex = 0;

        mAnimationType = otherOptions.mAnimationType;

        switch (otherOptions.mAnimationType) {

            case ANIM_CUSTOM:

                mAnimationType = otherOptions.mAnimationType;

                mCustomEnterResId = otherOptions.mCustomEnterResId;

                mCustomExitResId = otherOptions.mCustomExitResId;

                mThumbnail = null;
@@ -593,7 +593,6 @@ public class ActivityOptions { 
                mAnimationStartedListener = otherOptions.mAnimationStartedListener;

                break;

            case ANIM_SCALE_UP:

                mAnimationType = otherOptions.mAnimationType;

                mStartX = otherOptions.mStartX;

                mStartY = otherOptions.mStartY;

                mStartWidth = otherOptions.mStartWidth;
@@ -608,7 +607,6 @@ public class ActivityOptions { 
                break;

            case ANIM_THUMBNAIL_SCALE_UP:

            case ANIM_THUMBNAIL_SCALE_DOWN:

                mAnimationType = otherOptions.mAnimationType;

                mThumbnail = otherOptions.mThumbnail;

                mStartX = otherOptions.mStartX;

                mStartY = otherOptions.mStartY;
@@ -621,7 +619,6 @@ public class ActivityOptions { 
                mAnimationStartedListener = otherOptions.mAnimationStartedListener;

                break;

            case ANIM_SCENE_TRANSITION:

                mAnimationType = otherOptions.mAnimationType;

                mTransitionReceiver = otherOptions.mTransitionReceiver;

                mSharedElementNames = otherOptions.mSharedElementNames;

                mIsReturning = otherOptions.mIsReturning;

core/java/android/app/ExitTransitionCoordinator.java

+2 −0
Original line number Diff line number Diff line
@@ -123,6 +123,8 @@ class ExitTransitionCoordinator extends ActivityTransitionCoordinator { 
                    startSharedElementExit();

                }

            });

        } else {

            sharedElementTransitionComplete();

        }

    }