Return correct value for Activity#releaseInstance()
The documentation of Activity#releaseInstance() API tells that it
returns 'true' if it "has started the process of destroying its
current instance". However, the actual implementation that calls
ActivityRecord#destroyImmediately() would only return 'true' if
activity was removed from history immediately. In most cases it
would return 'false', since it would first send "destroy" message to
the client and wait for it to report back.
This CL switches the system-server implementation to return 'true' if
the activity is either destroying or destroyed as a result of
calling Activity#releaseInstance().
Bug: 137329632
Test: atest CtsWindowManagerDeviceTestCases:ActivityTests
Change-Id: I7d7287261d1742cffcf11ffeb32475019b978348
diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
index 3c5947a..f2ca2ba8 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
@@ -82,6 +82,8 @@
import static com.android.server.am.ActivityManagerServiceDumpProcessesProto.SCREEN_COMPAT_PACKAGES;
import static com.android.server.am.ActivityManagerServiceDumpProcessesProto.ScreenCompatPackage.MODE;
import static com.android.server.am.ActivityManagerServiceDumpProcessesProto.ScreenCompatPackage.PACKAGE;
+import static com.android.server.wm.ActivityStack.ActivityState.DESTROYED;
+import static com.android.server.wm.ActivityStack.ActivityState.DESTROYING;
import static com.android.server.wm.ActivityStack.REMOVE_TASK_MODE_DESTROYING;
import static com.android.server.wm.ActivityStackSupervisor.DEFER_RESUME;
import static com.android.server.wm.ActivityStackSupervisor.ON_TOP;
@@ -3237,11 +3239,12 @@
synchronized (mGlobalLock) {
final long origId = Binder.clearCallingIdentity();
try {
- ActivityRecord r = ActivityRecord.isInStackLocked(token);
- if (r == null) {
+ final ActivityRecord r = ActivityRecord.isInStackLocked(token);
+ if (r == null || !r.isDestroyable()) {
return false;
}
- return r.safelyDestroy("app-req");
+ r.destroyImmediately(true /* removeFromApp */, "app-req");
+ return r.isState(DESTROYING, DESTROYED);
} finally {
Binder.restoreCallingIdentity(origId);
}