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

Commit 1bcd351a authored by George Mount's avatar George Mount Committed by android-build-merger
Browse files

Merge \\"Fix NPE in startup wizard caused by former change.\\" into nyc-mr1-dev am: 3c357166 

am: 1d33feb8

Change-Id: I1653294849928e5667596c1d80ce29caecdf7c2f
parents dc37031c 1d33feb8

core/java/android/app/Activity.java

+2 −1
Original line number Diff line number Diff line
@@ -4275,7 +4275,8 @@ public class Activity extends ContextThemeWrapper 
    private Bundle transferSpringboardActivityOptions(Bundle options) {

        if (options == null && (mWindow != null && !mWindow.isActive())) {

            final ActivityOptions activityOptions = getActivityOptions();

            if (activityOptions.getAnimationType() == ActivityOptions.ANIM_SCENE_TRANSITION) {

            if (activityOptions != null &&

                    activityOptions.getAnimationType() == ActivityOptions.ANIM_SCENE_TRANSITION) {

                return activityOptions.toBundle();

            }

        }