Merge "Fix a crash in InstalledAppDetails" into jb-mr1-dev

This commit is contained in:
Amith Yamasani
2012-09-19 11:14:45 -07:00
committed by Android (Google) Code Review

View File

@@ -564,6 +564,16 @@ public class InstalledAppDetails extends Fragment
}
}
mAppEntry = mState.getEntry(packageName);
// Get application info again to refresh changed properties of application
try {
mPackageInfo = mPm.getPackageInfo(mAppEntry.info.packageName,
PackageManager.GET_DISABLED_COMPONENTS |
PackageManager.GET_UNINSTALLED_PACKAGES |
PackageManager.GET_SIGNATURES);
} catch (NameNotFoundException e) {
Log.e(TAG, "Exception when retrieving package:" + mAppEntry.info.packageName, e);
}
return packageName;
}
@@ -576,18 +586,11 @@ public class InstalledAppDetails extends Fragment
if (mAppEntry == null) {
return false; // onCreate must have failed, make sure to exit
}
// Get application info again to refresh changed properties of application
try {
mPackageInfo = mPm.getPackageInfo(mAppEntry.info.packageName,
PackageManager.GET_DISABLED_COMPONENTS |
PackageManager.GET_UNINSTALLED_PACKAGES |
PackageManager.GET_SIGNATURES);
} catch (NameNotFoundException e) {
Log.e(TAG, "Exception when retrieving package:" + mAppEntry.info.packageName, e);
if (mPackageInfo == null) {
return false; // onCreate must have failed, make sure to exit
}
// Get list of preferred activities
List<ComponentName> prefActList = new ArrayList<ComponentName>();