Merge "Do not finish multiple times." into nyc-dev

This commit is contained in:
Philip P. Moltmann
2016-03-18 16:19:43 +00:00
committed by Android (Google) Code Review

View File

@@ -159,6 +159,7 @@ 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;
@@ -2034,6 +2035,12 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat
return;
}
if (mState == STATE_FINISHING) {
return;
}
mState = STATE_FINISHING;
if (mPrinterRegistry != null) {
mPrinterRegistry.setTrackedPrinter(null);
}