am 208bd91b: Merge "[ActivityManager] Avoid system server crash due to package removed"

* commit '208bd91b2467dd5d4c41d5ada5c2bfa15c1b48c4':
  [ActivityManager] Avoid system server crash due to package removed
This commit is contained in:
Craig Mautner
2014-12-01 00:16:52 +00:00
committed by Android Git Automerger

View File

@@ -168,10 +168,20 @@ 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);
if (result != null) {
return result;
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