Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Catch NoSuchElementException when unbinding print doc death recipient" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-06-21 18:28:11 +00:00
committed by Android (Google) Code Review
parent d97f509923 2ccc6f1c06
commit ccc5c7c345
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/PrintSpooler/src/com/android/printspooler/model/RemotePrintDocument.java
View File

@@ -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...
} }
mPrintDocumentAdapter.asBinder().unlinkToDeath(mDeathRecipient, 0); 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) { private void scheduleCommand(AsyncCommand command) {

1
packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java
View File

@@ -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;