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

Commit 95cce9d5 authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

am 93d47b4c: Merge "Avoid system server crash due to package removed" into lmp-mr1-dev

* commit '93d47b4c':
  Avoid system server crash due to package removed
parents 435496e1 93d47b4c
Loading
Loading
Loading
Loading
+14 −4
Original line number Diff line number Diff line
@@ -168,11 +168,21 @@ public class ApplicationErrorReport implements Parcelable {
        PackageManager pm = context.getPackageManager();

        // look for receiver in the installer package
        String candidate = pm.getInstallerPackageName(packageName);
        ComponentName result = getErrorReportReceiver(pm, packageName, candidate);
        String candidate = null;
        ComponentName result = null;

        try {
            candidate = pm.getInstallerPackageName(packageName);
        } catch (IllegalArgumentException e) {
            // the package could already removed
        }

        if (candidate != null) {
            result = getErrorReportReceiver(pm, packageName, candidate);
            if (result != null) {
                return result;
            }
        }

        // if the error app is on the system image, look for system apps
        // error receiver