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

Commit cb632442 authored by Todd Kennedy's avatar Todd Kennedy Committed by android-build-merger
Browse files

Merge "ignore exception calling unlinkToDeath" into oc-dev

am: 79777a5b

Change-Id: Iaffd850d9422244d92340ac8c5c2346cbb58f39f
parents 1b136cb0 79777a5b
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -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) {
            try {
                mRemoteInstance.asBinder().unlinkToDeath(this, 0 /*flags*/);
            } catch (NoSuchElementException ignore) { }
        }
        mRemoteInstance = null;
    }