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

Commit 9db81649 authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20516026



Change-Id: Ib1972d63d98ec5b7431e43aa3964559414e9cc0c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7c14c5d9 a890b22d

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

                        }