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

Commit 1d33feb8 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

Change-Id: I8c1b64aee8c6e2b793fdc41def968113f71ed15c
parents 579764ab 3c357166

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();

            }

        }