commit a27749f9d64460ad4e83a9a33014d5fbc05184b9
author Songchun Fan <schfan@google.com> Mon Oct 24 16:33:11 2022 -0700
committer Song Chun Fan <schfan@google.com> Thu Oct 27 22:32:24 2022 +0000
tree 55a6d077e6564ed655379e4f3e8cf1048c3ffddd
parent 95d5281307986cb47bf6270267437b2cf41415f5

[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)

services/core/java/com/android/server/wm/ActivityStartInterceptor.java

diff --git a/services/core/java/com/android/server/wm/ActivityStartInterceptor.java b/services/core/java/com/android/server/wm/ActivityStartInterceptor.java
index 7d84bdf..d7c5e93 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 @@
         try {
             harmfulAppWarning = mService.getPackageManager()
                     .getHarmfulAppWarning(mAInfo.packageName, mUserId);
-        } catch (RemoteException ex) {
+        } catch (RemoteException | IllegalArgumentException ex) {
             return false;
         }