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

Merge "ignore exception calling unlinkToDeath" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-05-04 13:23:46 +00:00
committed by Android (Google) Code Review
parent a58589bdc1 34f5b421c5
commit 79777a5b43
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/pm/EphemeralResolverConnection.java
View File

@@ -43,6 +43,7 @@ import java.io.IOException;
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.List;
import java.util.NoSuchElementException;
import java.util.concurrent.TimeoutException;
/**
@@ -206,7 +207,9 @@ final class EphemeralResolverConnection implements DeathRecipient {
private void handleBinderDiedLocked() {
if (mRemoteInstance != null) {
mRemoteInstance.asBinder().unlinkToDeath(this, 0 /*flags*/);
try {
mRemoteInstance.asBinder().unlinkToDeath(this, 0 /*flags*/);
} catch (NoSuchElementException ignore) { }
}
mRemoteInstance = null;
}