Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 3c35716655

Change-Id: I8c1b64aee8c6e2b793fdc41def968113f71ed15c
This commit is contained in:
George Mount
2016-06-08 22:56:56 +00:00
committed by android-build-merger
parent 579764abf1 3c35716655
commit 1d33feb8bb
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/app/Activity.java
View File

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