Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I8bae21fe2fc110977b6ab4b795de0410db85df3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Louis Chang
2023-05-18 01:21:29 +00:00
committed by Automerger Merge Worker
parent df96dee98d 1d0fcb0f8d
commit 94bffa7396
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/app/servertransaction/TransactionExecutorHelper.java
View File

@@ -193,8 +193,8 @@ public class TransactionExecutorHelper {
switch (prevState) { switch (prevState) {
// TODO(lifecycler): Extend to support all possible states. // TODO(lifecycler): Extend to support all possible states.
case ON_START: case ON_START:
lifecycleItem = StartActivityItem.obtain(null /* activityOptions */); // Fall through to return the PAUSE item to ensure the activity is properly
break; // resumed while relaunching.
case ON_PAUSE: case ON_PAUSE:
lifecycleItem = PauseActivityItem.obtain(); lifecycleItem = PauseActivityItem.obtain();
break; break;