Merge "Fix issue #7178865: Selecting an app from Settings > Apps>..." into jb-mr1-dev (ba088af9) · Commits · e / os / android_packages_apps_Settings

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

+16 −7

Original line number	Diff line number	Diff line
		@@ -380,8 +380,6 @@ public class InstalledAppDetails extends Fragment
		public void onCreate(Bundle icicle) {
		super.onCreate(icicle);

		setHasOptionsMenu(true);

		mState = ApplicationsState.getInstance(getActivity().getApplication());
		mSession = mState.newSession(this);
		mPm = getActivity().getPackageManager();
		@@ -393,6 +391,10 @@ public class InstalledAppDetails extends Fragment
		mSmsManager = ISms.Stub.asInterface(ServiceManager.getService("isms"));

		mCanBeOnSdCardChecker = new CanBeOnSdCardChecker();

		retrieveAppEntry();

		setHasOptionsMenu(true);
		}

		@Override
		@@ -452,6 +454,8 @@ public class InstalledAppDetails extends Fragment
		boolean showIt = true;
		if (mUpdatedSysApp) {
		showIt = false;
		} else if (mAppEntry == null) {
		showIt = false;
		} else if ((mAppEntry.info.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
		showIt = false;
		} else if (mDpm.packageHasActiveAdmins(mPackageInfo.packageName)) {
		@@ -549,10 +553,7 @@ public class InstalledAppDetails extends Fragment
		public void onRunningStateChanged(boolean running) {
		}

		private boolean refreshUi() {
		if (mMoveInProgress) {
		return true;
		}
		private String retrieveAppEntry() {
		final Bundle args = getArguments();
		String packageName = (args != null) ? args.getString(ARG_PACKAGE_NAME) : null;
		if (packageName == null) {
		@@ -563,6 +564,14 @@ public class InstalledAppDetails extends Fragment
		}
		}
		mAppEntry = mState.getEntry(packageName);
		return packageName;
		}

		private boolean refreshUi() {
		if (mMoveInProgress) {
		return true;
		}
		final String packageName = retrieveAppEntry();

		if (mAppEntry == null) {
		return false; // onCreate must have failed, make sure to exit