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

Merge "Don't mix UI and print job state" into nyc-dev

Browse Source
This commit is contained in:
Philip P. Moltmann
2016-03-21 22:28:46 +00:00
committed by Android (Google) Code Review
parent 0c66db8487 b170c08387
commit b9893ec603
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -159,7 +159,6 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat
private static final int STATE_PRINTER_UNAVAILABLE = 6;
private static final int STATE_UPDATE_SLOW = 7;
private static final int STATE_PRINT_COMPLETED = 8;
private static final int STATE_FINISHING = 9;
private static final int UI_STATE_PREVIEW = 0;
private static final int UI_STATE_ERROR = 1;
@@ -255,6 +254,9 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat
/** Whether at least one print services is enabled or not */
private boolean mArePrintServicesEnabled;
/** Is doFinish() already in progress */
private boolean mIsFinishing;
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -2035,11 +2037,11 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat
return;
}
if (mState == STATE_FINISHING) {
if (mIsFinishing) {
return;
}
mState = STATE_FINISHING;
mIsFinishing = true;
if (mPrinterRegistry != null) {
mPrinterRegistry.setTrackedPrinter(null);