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

Commit 3c357166 authored by George Mount's avatar George Mount Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE in startup wizard caused by former change." into nyc-mr1-dev

parents ca7e80f3 96383782

core/java/android/app/Activity.java

+2 −1
Original line number Diff line number Diff line
@@ -4271,7 +4271,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();

            }

        }