commit 710b99f66f966463068eba16f815f7c4a1160414
author Song Chun Fan <schfan@google.com> Fri Oct 28 14:47:32 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Oct 28 14:47:32 2022 +0000
tree b5dcae46f9f64863a8a52d8cd37737dccc00f495
parent 096dd1a37a4a5134c06d039dbaa8a08628d14a1b
parent 73784f47ca7c97cf3f9a51780c3e6a2fe1de68cc

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20306304

Change-Id: I6f3abc4e536ed196c505a950137c8a0cd0c17cb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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