diff options
author | Marco Nelissen <marcone@google.com> | 2011-06-27 14:58:57 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-27 14:58:57 -0700 |
commit | 3a5079823add92343efe4c0ba2ea3cb5d32138ec (patch) | |
tree | 19d2fdb2353af8ca5765a88e03e6e8554fd69967 /src | |
parent | 3937b15bbfff67c5c1c57a2cfe3593552d1f3f6c (diff) | |
parent | 5d4b25c9a7c40d55f3bdb1ef095e5d0cf7cddcdf (diff) | |
download | packages_apps_settings-3a5079823add92343efe4c0ba2ea3cb5d32138ec.zip packages_apps_settings-3a5079823add92343efe4c0ba2ea3cb5d32138ec.tar.gz packages_apps_settings-3a5079823add92343efe4c0ba2ea3cb5d32138ec.tar.bz2 |
Merge "Fix crash in Settings"
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/settings/applications/InstalledAppDetails.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java index 40b5569..1c02f74 100644 --- a/src/com/android/settings/applications/InstalledAppDetails.java +++ b/src/com/android/settings/applications/InstalledAppDetails.java @@ -282,7 +282,7 @@ public class InstalledAppDetails extends Fragment intent.setPackage(mAppEntry.info.packageName); List<ResolveInfo> homes = mPm.queryIntentActivities(intent, 0); if ((homes != null && homes.size() > 0) || - (mPackageInfo != null && + (mPackageInfo != null && mPackageInfo.signatures != null && sys.signatures[0].equals(mPackageInfo.signatures[0]))) { // Disable button for core system applications. mUninstallButton.setText(R.string.disable_text); |