Merge "PackageInstaller: Plumb through status to message" (dff0e95e) · Commits · e / os / android_frameworks_base

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

+12 −6

Original line number	Original line	Diff line number	Diff line
	@@ -89,7 +89,8 @@ public class InstallInstalling extends AlertActivity {
	getPackageManager().installExistingPackage(appInfo.packageName);		getPackageManager().installExistingPackage(appInfo.packageName);
	launchSuccess();		launchSuccess();
	} catch (PackageManager.NameNotFoundException e) {		} catch (PackageManager.NameNotFoundException e) {
	launchFailure(PackageManager.INSTALL_FAILED_INTERNAL_ERROR, null);		launchFailure(PackageInstaller.STATUS_FAILURE,
			PackageManager.INSTALL_FAILED_INTERNAL_ERROR, null);
	}		}
	} else {		} else {
	final File sourceFile = new File(mPackageURI.getPath());		final File sourceFile = new File(mPackageURI.getPath());
	@@ -163,13 +164,15 @@ public class InstallInstalling extends AlertActivity {
	.addObserver(this, EventResultPersister.GENERATE_NEW_ID,		.addObserver(this, EventResultPersister.GENERATE_NEW_ID,
	this::launchFinishBasedOnResult);		this::launchFinishBasedOnResult);
	} catch (EventResultPersister.OutOfIdsException e) {		} catch (EventResultPersister.OutOfIdsException e) {
	launchFailure(PackageManager.INSTALL_FAILED_INTERNAL_ERROR, null);		launchFailure(PackageInstaller.STATUS_FAILURE,
			PackageManager.INSTALL_FAILED_INTERNAL_ERROR, null);
	}		}

	try {		try {
	mSessionId = getPackageManager().getPackageInstaller().createSession(params);		mSessionId = getPackageManager().getPackageInstaller().createSession(params);
	} catch (IOException e) {		} catch (IOException e) {
	launchFailure(PackageManager.INSTALL_FAILED_INTERNAL_ERROR, null);		launchFailure(PackageInstaller.STATUS_FAILURE,
			PackageManager.INSTALL_FAILED_INTERNAL_ERROR, null);
	}		}
	}		}

	@@ -194,13 +197,15 @@ public class InstallInstalling extends AlertActivity {
	/**		/**
	* Launch the "failure" version of the final package installer dialog		* Launch the "failure" version of the final package installer dialog
	*		*
			* @param statusCode The generic status code as returned by the package installer.
	* @param legacyStatus The status as used internally in the package manager.		* @param legacyStatus The status as used internally in the package manager.
	* @param statusMessage The status description.		* @param statusMessage The status description.
	*/		*/
	private void launchFailure(int legacyStatus, String statusMessage) {		private void launchFailure(int statusCode, int legacyStatus, String statusMessage) {
	Intent failureIntent = new Intent(getIntent());		Intent failureIntent = new Intent(getIntent());
	failureIntent.setClass(this, InstallFailed.class);		failureIntent.setClass(this, InstallFailed.class);
	failureIntent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);		failureIntent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
			failureIntent.putExtra(PackageInstaller.EXTRA_STATUS, statusCode);
	failureIntent.putExtra(PackageInstaller.EXTRA_LEGACY_STATUS, legacyStatus);		failureIntent.putExtra(PackageInstaller.EXTRA_LEGACY_STATUS, legacyStatus);
	failureIntent.putExtra(PackageInstaller.EXTRA_STATUS_MESSAGE, statusMessage);		failureIntent.putExtra(PackageInstaller.EXTRA_STATUS_MESSAGE, statusMessage);

	@@ -289,7 +294,7 @@ public class InstallInstalling extends AlertActivity {
	if (statusCode == PackageInstaller.STATUS_SUCCESS) {		if (statusCode == PackageInstaller.STATUS_SUCCESS) {
	launchSuccess();		launchSuccess();
	} else {		} else {
	launchFailure(legacyStatus, statusMessage);		launchFailure(statusCode, legacyStatus, statusMessage);
	}		}
	}		}

	@@ -410,7 +415,8 @@ public class InstallInstalling extends AlertActivity {
	getPackageManager().getPackageInstaller().abandonSession(mSessionId);		getPackageManager().getPackageInstaller().abandonSession(mSessionId);

	if (!isCancelled()) {		if (!isCancelled()) {
	launchFailure(PackageManager.INSTALL_FAILED_INVALID_APK, null);		launchFailure(PackageInstaller.STATUS_FAILURE,
			PackageManager.INSTALL_FAILED_INVALID_APK, null);
	}		}
	}		}
	}		}