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

Commit b5ebf53b authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Avoid potential NPE if the restore-below task is not collected" into... 

Merge "Avoid potential NPE if the restore-below task is not collected" into tm-qpr-dev am: 0fb2fcc7

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



Change-Id: Ic65d4a98bf75f73e0f673f277334154e146b07d8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 21274540 0fb2fcc7

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

+10 −7
Original line number Diff line number Diff line
@@ -1660,6 +1660,7 @@ class ActivityStarter { 
        transitionController.collect(r);

        try {

            mService.deferWindowLayout();

            try {

                Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "startActivityInner");

                result = startActivityInner(r, sourceRecord, voiceSession, voiceInteractor,

                        startFlags, doResume, options, inTask, inTaskFragment, restrictedBgActivity,
@@ -1668,6 +1669,8 @@ class ActivityStarter { 
                Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER);

                startedActivityRootTask = handleStartResult(r, options, result, newTransition,

                        remoteTransition);

            }

        } finally {

            mService.continueWindowLayout();

        }

        postStartActivityProcessing(r, result, startedActivityRootTask);

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

+3 −1
Original line number Diff line number Diff line
@@ -229,8 +229,10 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe 


        if (restoreBelow != null) {

            final ChangeInfo info = mChanges.get(restoreBelow);

            if (info != null) {

                info.mFlags |= ChangeInfo.FLAG_ABOVE_TRANSIENT_LAUNCH;

            }

        }

        ProtoLog.v(ProtoLogGroup.WM_DEBUG_WINDOW_TRANSITIONS, "Transition %d: Set %s as "

                + "transient-launch", mSyncId, activity);

    }