diff options
| -rw-r--r-- | services/core/java/com/android/server/wm/ActivityTaskSupervisor.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityTaskSupervisor.java b/services/core/java/com/android/server/wm/ActivityTaskSupervisor.java index 54664f5fbe3d..6eaeb15e30b5 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskSupervisor.java +++ b/services/core/java/com/android/server/wm/ActivityTaskSupervisor.java @@ -2593,7 +2593,8 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks { // Apply options to prevent pendingOptions be taken when scheduling // activity lifecycle transaction to make sure the override pending app // transition will be applied immediately. - if (activityOptions.getAnimationType() == ANIM_REMOTE_ANIMATION) { + if (activityOptions != null + && activityOptions.getAnimationType() == ANIM_REMOTE_ANIMATION) { targetActivity.mPendingRemoteAnimation = activityOptions.getRemoteAnimationAdapter(); } |