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

Merge "Catch exception when unlinkToDeath" into tm-qpr-dev am: 9a5afdb60b

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

Change-Id: I8596b049461d6e4a76a64b9406a11b7ee3893977
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-08-01 12:48:21 +00:00
committed by Automerger Merge Worker
parent 97f7858bb1 9a5afdb60b
commit 18b493725c
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/view/contentcapture/MainContentCaptureSession.java
View File

@@ -64,6 +64,7 @@ import java.lang.ref.WeakReference;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.NoSuchElementException;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
/** /**
@@ -630,7 +631,11 @@ public final class MainContentCaptureSession extends ContentCaptureSession {
mComponentName = null; mComponentName = null;
mEvents = null; mEvents = null;
if (mDirectServiceInterface != null) { if (mDirectServiceInterface != null) {
mDirectServiceInterface.asBinder().unlinkToDeath(mDirectServiceVulture, 0); try {
mDirectServiceInterface.asBinder().unlinkToDeath(mDirectServiceVulture, 0);
} catch (NoSuchElementException e) {
Log.w(TAG, "IContentCaptureDirectManager does not exist");
}
} }
mDirectServiceInterface = null; mDirectServiceInterface = null;
mHandler.removeMessages(MSG_FLUSH); mHandler.removeMessages(MSG_FLUSH);