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

Commit d7c64002 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 am: 9db81649 

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



Change-Id: Id19544bea6e60f5216e2d5d3bb3d078a38c4e3b8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d7afd158 9db81649

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

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

                        }