Merge "Fix a crash in InstalledAppDetails" into jb-mr1-dev (b92e9afe) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/applications/InstalledAppDetails.java

+13 −10

Original line number	Diff line number	Diff line
		@@ -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;
		}

		@@ -577,14 +587,7 @@ public class InstalledAppDetails extends Fragment
		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
		}