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

Commit 9cce8401 authored by wilsonshih's avatar wilsonshih Committed by Wei Sheng Shih
Browse files

Fixes NPE crash when startActivityFromRecents 

Fixes: 259507220
Test: atest AppTaskTests
Change-Id: Ief2d5a299f53076bedd9bdf8558f2d247da8ec93
parent 41fb1179

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

                        }