Merge "Cancel print job if PrintActivity was finished before spooler could be connected." (92c29360) · Commits · e / os / android_frameworks_base

packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java

+11 −2

Original line number	Diff line number	Diff line
		@@ -265,8 +265,15 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat
		new Runnable() {
		@Override
		public void run() {
		if (isFinishing()) {
		// onPause might have not been able to cancel the job, see PrintActivity#onPause
		// To be sure, cancel the job again. Double canceling does no harm.
		mSpoolerProvider.getSpooler().setPrintJobState(mPrintJob.getId(),
		PrintJobInfo.STATE_CANCELED, null);
		} else {
		onConnectedToPrintSpooler(adapter);
		}
		}
		});
		}

		@@ -353,8 +360,10 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat

		if (mState == STATE_INITIALIZING) {
		if (isFinishing()) {
		if (spooler != null) {
		spooler.setPrintJobState(mPrintJob.getId(), PrintJobInfo.STATE_CANCELED, null);
		}
		}
		super.onPause();
		return;
		}