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

Browse Source
This commit is contained in:
Winson Chung
2020-03-25 16:21:00 +00:00
committed by Android (Google) Code Review
parent 7da77f4141 b478e576ad
commit 97b931681f
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) { } catch (Exception e) {
Slog.w(TAG, "Exception thrown sending start: " + intent.getComponent(), 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; return false;
} }
@@ -4667,7 +4670,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
* and {@link #shouldPauseActivity(ActivityRecord)}. * and {@link #shouldPauseActivity(ActivityRecord)}.
*/ */
private boolean shouldStartActivity() { private boolean shouldStartActivity() {
return mVisibleRequested && isState(STOPPED); return mVisibleRequested && (isState(STOPPED) || isState(STOPPING));
} }
/** /**