diff options
| -rw-r--r-- | core/java/android/view/contentcapture/MainContentCaptureSession.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/core/java/android/view/contentcapture/MainContentCaptureSession.java b/core/java/android/view/contentcapture/MainContentCaptureSession.java index 98ef4e7ae6fa..90384b520315 100644 --- a/core/java/android/view/contentcapture/MainContentCaptureSession.java +++ b/core/java/android/view/contentcapture/MainContentCaptureSession.java @@ -64,6 +64,7 @@ import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.NoSuchElementException; import java.util.concurrent.atomic.AtomicBoolean; /** @@ -630,7 +631,11 @@ public final class MainContentCaptureSession extends ContentCaptureSession { mComponentName = null; mEvents = 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; mHandler.removeMessages(MSG_FLUSH); |