Merge "Fix re-installation via package uri-s" into qt-dev (a1705753) · Commits · e / os / android_frameworks_base

packages/PackageInstaller/src/com/android/packageinstaller/InstallInstalling.java

+23 −22

Original line number	Diff line number	Diff line
		@@ -83,6 +83,15 @@ public class InstallInstalling extends AlertActivity {
		ApplicationInfo appInfo = getIntent()
		.getParcelableExtra(PackageUtil.INTENT_ATTR_APPLICATION_INFO);
		mPackageURI = getIntent().getData();

		if ("package".equals(mPackageURI.getScheme())) {
		try {
		getPackageManager().installExistingPackage(appInfo.packageName);
		launchSuccess();
		} catch (PackageManager.NameNotFoundException e) {
		launchFailure(PackageManager.INSTALL_FAILED_INTERNAL_ERROR, null);
		}
		} else {
		final File sourceFile = new File(mPackageURI.getPath());
		PackageUtil.AppSnippet as = PackageUtil.getAppSnippet(this, appInfo, sourceFile);

		@@ -106,14 +115,6 @@ public class InstallInstalling extends AlertActivity {
		setupAlert();
		requireViewById(R.id.installing).setVisibility(View.VISIBLE);

		if ("package".equals(mPackageURI.getScheme())) {
		try {
		getPackageManager().installExistingPackage(appInfo.packageName);
		launchSuccess();
		} catch (PackageManager.NameNotFoundException e) {
		launchFailure(PackageManager.INSTALL_FAILED_INTERNAL_ERROR, null);
		}
		} else {
		if (savedInstanceState != null) {
		mSessionId = savedInstanceState.getInt(SESSION_ID);
		mInstallId = savedInstanceState.getInt(INSTALL_ID);