Merge "Fix a crash in print spooler." into lmp-dev (e03ddd0b) · Commits · e / os / android_frameworks_base

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

+11 −4

Original line number	Diff line number	Diff line
		@@ -221,8 +221,6 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat
		public void onCreate(Bundle savedInstanceState) {
		super.onCreate(savedInstanceState);

		setState(STATE_CONFIGURING);

		Bundle extras = getIntent().getExtras();

		mPrintJob = extras.getParcelable(PrintManager.EXTRA_PRINT_JOB);
		@@ -313,13 +311,17 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat

		@Override
		public void onPause() {
		PrintSpoolerService spooler = mSpoolerProvider.getSpooler();

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

		if (isFinishing()) {
		PrintSpoolerService spooler = mSpoolerProvider.getSpooler();
		spooler.updatePrintJobUserConfigurableOptionsNoPersistence(mPrintJob);

		switch (mState) {
		@@ -345,6 +347,10 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat
		mPrinterRegistry.setTrackedPrinter(null);
		mPrintPreviewController.destroy();
		mSpoolerProvider.destroy();

		if (mPrintedDocument.isUpdating()) {
		mPrintedDocument.cancel();
		}
		mPrintedDocument.finish();
		mPrintedDocument.destroy();
		}
		@@ -366,7 +372,8 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat
		@Override
		public boolean onKeyUp(int keyCode, KeyEvent event) {
		if (mState == STATE_INITIALIZING) {
		return super.onKeyUp(keyCode, event);
		finish();
		return true;
		}

		if (keyCode == KeyEvent.KEYCODE_BACK