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

Merge "Account for stopping activities when determining whether to restart" into rvc-dev am: 97b931681f am: a87cb3c6a6

Browse Source 
Change-Id: I682e272747398cf33424d60170f921880e6f1540
This commit is contained in:
Winson Chung
2020-03-25 16:24:34 +00:00
committed by Automerger Merge Worker
parent 6b1169b66a a87cb3c6a6
commit ade9f06e73
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/wm/ActivityRecord.java
View File

@@ -4618,6 +4618,9 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
} catch (Exception e) {
Slog.w(TAG, "Exception thrown sending start: " + intent.getComponent(), e);
}
// The activity may be waiting for stop, but that is no longer appropriate if we are
// starting the activity again
mStackSupervisor.mStoppingActivities.remove(this);
}
return false;
}
@@ -4667,7 +4670,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
* and {@link #shouldPauseActivity(ActivityRecord)}.
*/
private boolean shouldStartActivity() {
return mVisibleRequested && isState(STOPPED);
return mVisibleRequested && (isState(STOPPED) || isState(STOPPING));
}
/**