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

Catch exception when unlinkToDeath

Browse Source 
Catch the exception to avoid the system down.

Bug: 238417834
Test: atest CtsCaontentCaptureService
Change-Id: Ifacb91d9e961b71df0ac41690b952be981711870
This commit is contained in:
TYM Tsai
2022-07-19 05:56:51 +00:00
parent ab77dc520b
commit af2eba80db
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
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) {
try {
mDirectServiceInterface.asBinder().unlinkToDeath(mDirectServiceVulture, 0); 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);