commit 73784f47ca7c97cf3f9a51780c3e6a2fe1de68cc
author Song Chun Fan <schfan@google.com> Fri Oct 28 14:21:58 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 28 14:21:58 2022 +0000
tree de555673d92c7b6adfbd1b3c744d9f726a199dc6
parent dcc02cbeddcfbfabd16bd754bc12a687f2061cf9
parent a27749f9d64460ad4e83a9a33014d5fbc05184b9

Merge "[am] catch IllegalArgumentException from getHarmfulAppWarning" into tm-qpr-dev

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;
         }