Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a6b5869f: Merge "Fix a crash in print spooler." into lmp-dev

Browse Source 
* commit 'a6b5869f409f9674ef046e8f997e5f97b71b794a':
  Fix a crash in print spooler.
This commit is contained in:
Svetoslav
2014-09-10 23:10:46 +00:00
committed by Android Git Automerger
parent 993137dcdc e03ddd0bcc
commit 212a8bf326
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java
View File

@@ -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