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

Commit 2ccc6f1c authored by Erik Wolsheimer's avatar Erik Wolsheimer
Browse files

Catch NoSuchElementException when unbinding print doc death recipient 

Fixes: 177873499
Test: Manual
Change-Id: Ia77e6d2c9d7e552beb0a2df10d6d4f13c7230446
parent 7ed65c1d

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

+7 −1
Original line number Original line Diff line number Diff line
@@ -52,6 +52,7 @@ import java.io.InputStream; 
import java.io.OutputStream;

import java.io.OutputStream;

import java.lang.ref.WeakReference;

import java.lang.ref.WeakReference;

import java.util.Arrays;

import java.util.Arrays;

import java.util.NoSuchElementException;





public final class RemotePrintDocument {

public final class RemotePrintDocument {

    private static final String LOG_TAG = "RemotePrintDocument";

    private static final String LOG_TAG = "RemotePrintDocument";
@@ -441,7 +442,12 @@ public final class RemotePrintDocument { 
            // Keep going - best effort...

            // Keep going - best effort...

        }

        }





        try {

            mPrintDocumentAdapter.asBinder().unlinkToDeath(mDeathRecipient, 0);

            mPrintDocumentAdapter.asBinder().unlinkToDeath(mDeathRecipient, 0);

        } catch (NoSuchElementException e) {

            Log.w(LOG_TAG, "Error unlinking print document adapter death recipient.");

            // Keep going - best effort...

        }

    }

    }





    private void scheduleCommand(AsyncCommand command) {

    private void scheduleCommand(AsyncCommand command) {

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -61,7 +61,6 @@ import android.print.PrinterId; 
import android.print.PrinterInfo;

import android.print.PrinterInfo;

import android.printservice.PrintService;

import android.printservice.PrintService;

import android.printservice.PrintServiceInfo;

import android.printservice.PrintServiceInfo;

import android.provider.DocumentsContract;

import android.text.Editable;

import android.text.Editable;

import android.text.TextUtils;

import android.text.TextUtils;

import android.text.TextWatcher;

import android.text.TextWatcher;