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

Commit 94bffa73 authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

Merge "Relaunching activity to PAUSE state" into udc-qpr-dev am: 1d0fcb0f 

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



Change-Id: I8bae21fe2fc110977b6ab4b795de0410db85df3d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents df96dee9 1d0fcb0f

core/java/android/app/servertransaction/TransactionExecutorHelper.java

+2 −2
Original line number Diff line number Diff line
@@ -193,8 +193,8 @@ public class TransactionExecutorHelper { 
        switch (prevState) {

            // TODO(lifecycler): Extend to support all possible states.

            case ON_START:

                lifecycleItem = StartActivityItem.obtain(null /* activityOptions */);

                break;

                // Fall through to return the PAUSE item to ensure the activity is properly

                // resumed while relaunching.

            case ON_PAUSE:

                lifecycleItem = PauseActivityItem.obtain();

                break;