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

Commit a890b22d authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Android (Google) Code Review
Browse files

Merge "Fixes NPE crash when startActivityFromRecents" into tm-qpr-dev

parents e223e2bd 9cce8401

services/core/java/com/android/server/wm/ActivityTaskSupervisor.java

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

                        }