summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Alexei Nicoara <ancr@google.com> 2024-03-12 16:10:13 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-03-12 16:10:13 +0000
commit1b2e1c929bb0867fa021e18a8efad3b96a346bc1 (patch)
treeda509bb4e823eef7dafffe5150aa9e2051d61119
parentf4ba4e5ca45559dba419fb18a7f2998e9ee03728 (diff)
parent509f604afee2120686ddfdb1fae9b3747830dae2 (diff)
Merge "Ignore IllegalStateException" into main am: 509f604afe
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2995016 Change-Id: I473ced15a778bf6700f549d156f38d9fe8308d18 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--packages/CrashRecovery/services/java/com/android/server/RescueParty.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/CrashRecovery/services/java/com/android/server/RescueParty.java b/packages/CrashRecovery/services/java/com/android/server/RescueParty.java
index 0fcec268fe9c..d0fee44f791f 100644
--- a/packages/CrashRecovery/services/java/com/android/server/RescueParty.java
+++ b/packages/CrashRecovery/services/java/com/android/server/RescueParty.java
@@ -707,7 +707,7 @@ public class RescueParty {
if (pm.getModuleInfo(packageName, 0) != null) {
return true;
}
- } catch (PackageManager.NameNotFoundException ignore) {
+ } catch (PackageManager.NameNotFoundException | IllegalStateException ignore) {
}
return isPersistentSystemApp(packageName);