Merge "Do not restart process of a finishing activity" into udc-dev

2023-04-07 04:45:50 +00:00
parent 8278342553 cedb99de0d
commit f37f9d12c2
1 changed files with 1 additions and 0 deletions
--- a/services/core/java/com/android/server/wm/ActivityRecord.java
+++ b/services/core/java/com/android/server/wm/ActivityRecord.java
@@ -9762,6 +9762,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
     * directly with keeping its record.
     */
    void restartProcessIfVisible() {
+        if (finishing) return;
        Slog.i(TAG, "Request to restart process of " + this);

        // Reset the existing override configuration so it can be updated according to the latest