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

Commit d30a3c7f authored by TYM Tsai's avatar TYM Tsai
Browse files

Catch exception when unlinkToDeath 

Catch the exception to avoid the system down.

Bug: 238417834
Test: atest CtsCaontentCaptureService
Change-Id: Ifacb91d9e961b71df0ac41690b952be981711870
Merged-In: Ifacb91d9e961b71df0ac41690b952be981711870
parent 9d30d715

core/java/android/view/contentcapture/MainContentCaptureSession.java

+6 −1
Original line number Diff line number Diff line
@@ -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) {

            try {

                mDirectServiceInterface.asBinder().unlinkToDeath(mDirectServiceVulture, 0);

            } catch (NoSuchElementException e) {

                Log.w(TAG, "IContentCaptureDirectManager does not exist");

            }

        }

        mDirectServiceInterface = null;

        mHandler.removeMessages(MSG_FLUSH);