Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00325a9c authored by Alex Buynytskyy's avatar Alex Buynytskyy Committed by Automerger Merge Worker
Browse files

Merge "Better error message for unexpected exceptions." into tm-dev am: 645d078e 

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

Change-Id: I2ca0a66524aba1580e5c93574d97430456f8a86a
parents 35034af7 645d078e

services/core/java/com/android/server/pm/PackageManagerService.java

+3 −2
Original line number Diff line number Diff line
@@ -2573,8 +2573,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;

        }