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

Commit 2ff245e3 authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by android-build-merger
Browse files

Merge "RemotePrintDocument might get destroyed in constructor" into nyc-dev 

am: c37a3236

* commit 'c37a3236':
  RemotePrintDocument might get destroyed in constructor

Change-Id: Ib408de348136afa88ccf7e5401e11e57cd1f414a
parents 637d2992 c37a3236

packages/PrintSpooler/src/com/android/printspooler/model/RemotePrintDocument.java

+3 −1
Original line number Diff line number Diff line
@@ -178,6 +178,8 @@ public final class RemotePrintDocument { 
        }

        if (mState == STATE_FAILED) {

            Log.w(LOG_TAG, "Failed before start.");

        } else if (mState == STATE_DESTROYED) {

            Log.w(LOG_TAG, "Destroyed before start.");

        } else {

            if (mState != STATE_INITIAL) {

                throw new IllegalStateException("Cannot start in state:" + stateToString(mState));
@@ -267,7 +269,7 @@ public final class RemotePrintDocument { 
        }

        if (mState != STATE_STARTED && mState != STATE_UPDATED

                && mState != STATE_FAILED && mState != STATE_CANCELING

                && mState != STATE_CANCELED) {

                && mState != STATE_CANCELED && mState != STATE_DESTROYED) {

            throw new IllegalStateException("Cannot finish in state:"

                    + stateToString(mState));

        }