diff options
| author | Bryce Lee <brycelee@google.com> | 2018-02-28 07:26:17 -0800 |
|---|---|---|
| committer | Bryce Lee <brycelee@google.com> | 2018-03-01 10:05:39 -0800 |
| commit | 6ff1707bcb93834efef3efda2611a5ae924ab7fe (patch) | |
| tree | ca97f90b46e7e77320ae9458257148d775aabecb /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 3f6bd7b6088b1eddfe3fe0353eb524d5bf3bc48d (diff) | |
Do not always destroy activity when cleaning up.
There are some invocations of ActivityStack#cleanUpActivityLocked
where the activity is not removed from history. In this case, we
want to keep the ActivityRecord around, but clear the process.
Previously, we were also setting the state to destroy. This is
inconsistent with the client side state, which is still in the
stopped state. With recent changes, this state change now causes
the server side record to be destroyed, removing it from history
and causing it to not return on back traversal.
This changelist separates clearing the app process from setting the
activity state, allowing for the record to remain when appropriate.
Bug: 71506345
Test: atest CtsActivityManagerDeviceTestCases:ActivityLifecycleTests#testRestoreFromKill
Test: atest FrameworksServicesTests:com.android.server.am.ActivityRecordTests#testFinishingAfterDestroying
Test: atest FrameworksServicesTests:com.android.server.am.ActivityRecordTests#testFinishingAfterDestroyed
Change-Id: I98366a1b51d8d4d002536683c6335ee57c22129c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions