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

Merge "Destroy ActivityRecord when it is removed from the hierarchy" into sc-v2-dev am: 8d0616af08 am: 510dcd6feb

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

Change-Id: Icbf68e3f18c9ec53defabdf3a600cf89e86c0662
This commit is contained in:
Chris Li
2021-08-05 18:44:10 +00:00
committed by Automerger Merge Worker
parent fd992641b6 510dcd6feb
commit 624688c96b
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3687,7 +3687,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
@Override
void removeImmediately() {
if (!finishing) {
if (!isState(DESTROYING, DESTROYED)) {
// If Task#removeImmediately is called directly with alive activities, ensure that the
// activities are destroyed and detached from process.
destroyImmediately("removeImmediately");

15
services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java
View File

@@ -1615,6 +1615,21 @@ public class ActivityRecordTests extends WindowTestsBase {
assertFalse(wpc.hasActivities());
}
@Test
public void testRemoveImmediatelyWithFinishingActivity() throws RemoteException {
final ActivityRecord activity = createActivityWithTask();
final WindowProcessController wpc = activity.app;
activity.makeFinishingLocked();
assertTrue(activity.finishing);
activity.getTask().removeImmediately("test");
verify(mAtm.getLifecycleManager()).scheduleTransaction(any(), eq(activity.appToken),
isA(DestroyActivityItem.class));
assertFalse(wpc.hasActivities());
assertEquals(DESTROYING, activity.getState());
}
@Test
public void testRemoveFromHistory() {
final ActivityRecord activity = createActivityWithTask();