From d7f4972ad5ff4ca7a2d6d7e2958f869dbfde7934 Mon Sep 17 00:00:00 2001
From: yzj <yzj@google.com>
Date: Mon, 4 Oct 2021 18:38:36 +0000
Subject: [PATCH] Catch IllegalArgumentException from startActivityFromRecents.

This may happen when the task id doesn't exist.

Bug: 197273843
Test: none
Change-Id: I1900b93bbf091379264f1136d4c67f0b462664a7
---
 .../core/java/com/android/server/policy/PhoneWindowManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index 1890a1f7573a1..02226c81f3240 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -1358,7 +1358,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
         }
         try {
             ActivityManager.getService().startActivityFromRecents(targetTask.persistentId, null);
-        } catch (RemoteException e) {
+        } catch (RemoteException | IllegalArgumentException e) {
             Slog.e(TAG, "Failed to start task " + targetTask.persistentId + " from recents", e);
         }
     }