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

Commit 36428d56 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Catch NoSuchElementException when unbinding print doc death recipient"...

Merge "Catch NoSuchElementException when unbinding print doc death recipient" into sc-dev am: ccc5c7c3 am: 66a13d04

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15032087

Change-Id: I03df2b2c89a8498ac5b777decc85442284ef35e1
parents 6b232e53 66a13d04
Loading
Loading
Loading
Loading
+7 −1
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.lang.ref.WeakReference;
import java.util.Arrays;
import java.util.NoSuchElementException;

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

        try {
            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) {
+0 −1
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ import android.print.PrinterId;
import android.print.PrinterInfo;
import android.printservice.PrintService;
import android.printservice.PrintServiceInfo;
import android.provider.DocumentsContract;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;