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

Merge "Fix extra onStop when finishing after onCreate" into qt-dev

Browse Source 
am: 008483c045

Change-Id: I3981baeae3179677f1f80fd9db43cf6443940519
This commit is contained in:
Andrii Kulian
2019-04-16 15:55:45 -07:00
committed by android-build-merger
parent bcbd28d46e 008483c045
commit 2ae53beaeb
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/ActivityThread.java
View File

@@ -4549,7 +4549,7 @@ public final class ActivityThread extends ClientTransactionHandler {
if (!show && !r.stopped) { if (!show && !r.stopped) {
performStopActivityInner(r, null /* stopInfo */, show, false /* saveState */, performStopActivityInner(r, null /* stopInfo */, show, false /* saveState */,
false /* finalStateRequest */, "handleWindowVisibility"); false /* finalStateRequest */, "handleWindowVisibility");
} else if (show && r.stopped) { } else if (show && r.getLifecycleState() == ON_STOP) {
// If we are getting ready to gc after going to the background, well // If we are getting ready to gc after going to the background, well
// we are back active so skip it. // we are back active so skip it.
unscheduleGcIdler(); unscheduleGcIdler();