Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[ActivityManager] Avoid system server crash due to package removed"

Browse Source
This commit is contained in:
Craig Mautner
2014-12-01 00:11:51 +00:00
committed by Gerrit Code Review
parent 7db48ed036 bd4a9a0cd8
commit 208bd91b24
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/app/ApplicationErrorReport.java
View File

@@ -168,11 +168,21 @@ public class ApplicationErrorReport implements Parcelable {
PackageManager pm = context.getPackageManager(); PackageManager pm = context.getPackageManager();
// look for receiver in the installer package // look for receiver in the installer package
String candidate = pm.getInstallerPackageName(packageName); String candidate = null;
ComponentName result = getErrorReportReceiver(pm, packageName, candidate); 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) { if (result != null) {
return result; return result;
} }
}
// if the error app is on the system image, look for system apps // if the error app is on the system image, look for system apps
// error receiver // error receiver