Merge "No canceling while package manager is processing" (50c3fa8d) · Commits · e / os / android_packages_apps_PackageInstaller

src/com/android/packageinstaller/InstallInstalling.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -220,6 +220,7 @@ public class InstallInstalling extends Activity {
		} else {
		// we will receive a broadcast when the install is finished
		mCancelButton.setEnabled(false);
		setFinishOnTouchOutside(false);
		}
		}
		}
		@@ -232,6 +233,13 @@ public class InstallInstalling extends Activity {
		outState.putInt(INSTALL_ID, mInstallId);
		}

		@Override
		public void onBackPressed() {
		if (mCancelButton.isEnabled()) {
		super.onBackPressed();
		}
		}

		@Override
		protected void onStop() {
		super.onStop();
		@@ -384,6 +392,7 @@ public class InstallInstalling extends Activity {

		session.commit(pendingIntent.getIntentSender());
		mCancelButton.setEnabled(false);
		setFinishOnTouchOutside(false);
		} else {
		getPackageManager().getPackageInstaller().abandonSession(mSessionId);
		launchFailure(PackageInstaller.STATUS_FAILURE, null);