From 963837821af3329cc3072d6c254b7b0f4fe118b2 Mon Sep 17 00:00:00 2001
From: George Mount <mount@google.com>
Date: Wed, 8 Jun 2016 15:13:52 -0700
Subject: [PATCH] Fix NPE in startup wizard caused by former change.

Bug 29211438

Change-Id: I0c979c945e79a6982d97013f961b00db3c9a9f00
---
 core/java/android/app/Activity.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index 890e67d7bc97c..cb17be335e928 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -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();
             }
         }