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

Commit a53dd1e7 authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

Merge "Schedule lifecycle-stops after every transition" into tm-qpr-dev am:... 

Merge "Schedule lifecycle-stops after every transition" into tm-qpr-dev am: 8a55af9e am: e161eca8

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



Change-Id: Icda6861f84d1e836dd21e908625b96dc71a4cdfe
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b55f226f e161eca8

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

+4 −8
Original line number Diff line number Diff line
@@ -490,7 +490,6 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe 
        }



        // Commit all going-invisible containers

        boolean activitiesWentInvisible = false;

        for (int i = 0; i < mParticipants.size(); ++i) {

            final ActivityRecord ar = mParticipants.valueAt(i).asActivityRecord();

            if (ar != null) {
@@ -541,7 +540,6 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe 
                        }

                        ar.commitVisibility(false /* visible */, false /* performLayout */,

                                true /* fromTransition */);

                        activitiesWentInvisible = true;

                    }

                }

                if (mChanges.get(ar).mVisible != visibleAtTransitionEnd) {
@@ -568,12 +566,10 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe 
                mController.dispatchLegacyAppTransitionFinished(ar);

            }

        }

        if (activitiesWentInvisible) {

        // Always schedule stop processing when transition finishes because activities don't

        // stop while they are in a transition thus their stop could still be pending.

        mController.mAtm.mTaskSupervisor

                .scheduleProcessStoppingAndFinishingActivitiesIfNeeded();

        }



        sendRemoteCallback(mClientAnimationFinishCallback);