From a27749f9d64460ad4e83a9a33014d5fbc05184b9 Mon Sep 17 00:00:00 2001
From: Songchun Fan <schfan@google.com>
Date: Mon, 24 Oct 2022 16:33:11 -0700
Subject: [PATCH] [am] catch IllegalArgumentException from getHarmfulAppWarning

A missing package should not cause system_server crash.

BUG: 253989182
Test: builds
Merged-In: I55fd685280ea6a3d08b9c838b2245ed6dec0aa56
Change-Id: I55fd685280ea6a3d08b9c838b2245ed6dec0aa56
(cherry picked from commit 20e4747134c49501e67a1b0df1fe17f350937787)
---
 .../java/com/android/server/wm/ActivityStartInterceptor.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/ActivityStartInterceptor.java b/services/core/java/com/android/server/wm/ActivityStartInterceptor.java
index 7d84bdf78056e..d7c5e9373ad31 100644
--- a/services/core/java/com/android/server/wm/ActivityStartInterceptor.java
+++ b/services/core/java/com/android/server/wm/ActivityStartInterceptor.java
@@ -424,7 +424,7 @@ class ActivityStartInterceptor {
         try {
             harmfulAppWarning = mService.getPackageManager()
                     .getHarmfulAppWarning(mAInfo.packageName, mUserId);
-        } catch (RemoteException ex) {
+        } catch (RemoteException | IllegalArgumentException ex) {
             return false;
         }