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

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

am fddc4bfe: am b1cd745f: Merge "Fail print jobs targeted to unavailable services." into klp-dev 

* commit 'fddc4bfe':
  Fail print jobs targeted to unavailable services.
parents 4bf36c3e fddc4bfe

core/res/res/values/strings.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -4451,6 +4451,9 @@ 
    <!-- Print fail reason: unknown. [CHAR LIMIT=25] -->

    <!-- Print fail reason: unknown. [CHAR LIMIT=25] -->

    <string name="reason_unknown">unknown</string>

    <string name="reason_unknown">unknown</string>





    <!-- Print fail reason: the print service that has to process the print job is not available. [CHAR LIMIT=none] -->

    <string name="reason_service_unavailable">Print service not enabled</string>



    <!-- Title for the notification that a print service was installed. [CHAR LIMIT=50] -->

    <!-- Title for the notification that a print service was installed. [CHAR LIMIT=50] -->

    <string name="print_service_installed_title"><xliff:g id="name" example="Cloud Print">%s</xliff:g> service installed</string>

    <string name="print_service_installed_title"><xliff:g id="name" example="Cloud Print">%s</xliff:g> service installed</string>

    <!-- Message for the notification that a print service was installed. [CHAR LIMIT=50] -->

    <!-- Message for the notification that a print service was installed. [CHAR LIMIT=50] -->

core/res/res/values/symbols.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -928,6 +928,7 @@ 
  <java-symbol type="string" name="mediasize_japanese_kahu" />

  <java-symbol type="string" name="mediasize_japanese_kahu" />

  <java-symbol type="string" name="mediasize_japanese_kaku2" />

  <java-symbol type="string" name="mediasize_japanese_kaku2" />

  <java-symbol type="string" name="mediasize_japanese_you4" />

  <java-symbol type="string" name="mediasize_japanese_you4" />

  <java-symbol type="string" name="reason_service_unavailable" />

  <java-symbol type="string" name="reason_unknown" />

  <java-symbol type="string" name="reason_unknown" />

  <java-symbol type="string" name="restr_pin_enter_admin_pin" />

  <java-symbol type="string" name="restr_pin_enter_admin_pin" />

  <java-symbol type="string" name="restr_pin_enter_pin" />

  <java-symbol type="string" name="restr_pin_enter_pin" />

services/java/com/android/server/print/UserState.java

+6 −1
Original line number Original line Diff line number Diff line
@@ -134,6 +134,11 @@ final class UserState implements PrintSpoolerCallbacks, PrintServiceCallbacks { 
        }

        }

        if (service != null) {

        if (service != null) {

            service.onPrintJobQueued(printJob);

            service.onPrintJobQueued(printJob);

        } else {

            // The service for the job is no longer enabled, so just

            // fail the job with the appropriate message.

            mSpooler.setPrintJobState(printJob.getId(), PrintJobInfo.STATE_FAILED,

                    mContext.getString(R.string.reason_service_unavailable));

        }

        }

    }

    }
@@ -779,7 +784,7 @@ final class UserState implements PrintSpoolerCallbacks, PrintServiceCallbacks { 
            for (int i = 0; i < printJobCount; i++) {

            for (int i = 0; i < printJobCount; i++) {

                PrintJobInfo printJob = printJobs.get(i);

                PrintJobInfo printJob = printJobs.get(i);

                mSpooler.setPrintJobState(printJob.getId(), PrintJobInfo.STATE_FAILED,

                mSpooler.setPrintJobState(printJob.getId(), PrintJobInfo.STATE_FAILED,

                        mContext.getString(R.string.reason_unknown));

                        mContext.getString(R.string.reason_service_unavailable));

            }

            }

        } finally {

        } finally {

            Binder.restoreCallingIdentity(identity);

            Binder.restoreCallingIdentity(identity);