From 44a8cb1322e045896cf764ec368e963ee6e22244 Mon Sep 17 00:00:00 2001
From: Alex Buynytskyy <alexbuy@google.com>
Date: Tue, 22 Feb 2022 16:48:47 -0800
Subject: [PATCH] Better error message for unexpected exceptions.

Bug: 220930052
Test: atest ChecksumsTest
Change-Id: Ie7a664fedfa78cb9f0b5445ec271b9fb2a2f7611
---
 .../java/com/android/server/pm/PackageManagerService.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 0602f3e72031c..8435f04bd61f1 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -2557,8 +2557,9 @@ public class PackageManagerService extends IPackageManager.Stub
         try {
             return super.onTransact(code, data, reply, flags);
         } catch (RuntimeException e) {
-            if (!(e instanceof SecurityException) && !(e instanceof IllegalArgumentException)) {
-                Slog.wtf(TAG, "Package Manager Crash", e);
+            if (!(e instanceof SecurityException) && !(e instanceof IllegalArgumentException)
+                    && !(e instanceof ParcelableException)) {
+                Slog.wtf(TAG, "Package Manager Unexpected Exception", e);
             }
             throw e;
         }