Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca0c744b authored by Svetoslav's avatar Svetoslav Committed by Android Git Automerger
Browse files

am 695ac3a5: am a6960246: Print to PDF putting a pring job in a wrong state. 

* commit '695ac3a556677caa33b621ddf76532346206d86e':
  Print to PDF putting a pring job in a wrong state.
parents f3662e4c 3063849f

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

+10 −1
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat 
    private static final int STATE_CREATE_FILE_FAILED = 4;

    private static final int STATE_PRINTER_UNAVAILABLE = 5;

    private static final int STATE_UPDATE_SLOW = 6;

    private static final int STATE_PRINT_COMPLETED = 7;



    private static final int UI_STATE_PREVIEW = 0;

    private static final int UI_STATE_ERROR = 1;
@@ -304,6 +305,10 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat 
                    spooler.setPrintJobState(mPrintJob.getId(), PrintJobInfo.STATE_QUEUED, null);

                } break;



                case STATE_PRINT_COMPLETED: {

                    spooler.setPrintJobState(mPrintJob.getId(), PrintJobInfo.STATE_COMPLETED, null);

                } break;



                case STATE_CREATE_FILE_FAILED: {

                    spooler.setPrintJobState(mPrintJob.getId(), PrintJobInfo.STATE_FAILED,

                            getString(R.string.print_write_error_message));
@@ -539,6 +544,8 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat 


    private void onStartCreateDocumentActivityResult(int resultCode, Intent data) {

        if (resultCode == RESULT_OK && data != null) {

            setState(STATE_PRINT_COMPLETED);

            updateOptionsUi();

            Uri uri = data.getData();

            mPrintedDocument.writeContent(getContentResolver(), uri);

            // Calling finish here does not invoke lifecycle callbacks but we
@@ -706,7 +713,8 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat 


    private static boolean isFinalState(int state) {

        return state == STATE_PRINT_CONFIRMED

                || state == STATE_PRINT_CANCELED;

                || state == STATE_PRINT_CANCELED

                || state == STATE_PRINT_COMPLETED;

    }



    private void updateSelectedPagesFromPreview() {
@@ -1060,6 +1068,7 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat 
        }



        if (mState == STATE_PRINT_CONFIRMED

                || mState == STATE_PRINT_COMPLETED

                || mState == STATE_PRINT_CANCELED

                || mState == STATE_UPDATE_FAILED

                || mState == STATE_CREATE_FILE_FAILED