Merge "Fix remove-before-add for IpSecService RefcountedResource"

                    mBinder.linkToDeath(this, 0);

                } catch (RemoteException e) {

                    binderDied();

                    e.rethrowFromSystemServer();

                }

            }

        }

import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertNull;

import static org.junit.Assert.fail;

import static org.mockito.Matchers.anyInt;

import static org.mockito.Matchers.anyObject;

import static org.mockito.Matchers.eq;

        IBinder binderMock = mock(IBinder.class);

        doThrow(new RemoteException()).when(binderMock).linkToDeath(anyObject(), anyInt());

        RefcountedResource<IResource> refcountedResource = getTestRefcountedResource(binderMock);

        // Verify that cleanup is performed (Spy limitations prevent verification of method calls

        // for binder death scenario; check refcount to determine if cleanup was performed.)

        assertEquals(-1, refcountedResource.mRefCount);

        try {

            getTestRefcountedResource(binderMock);

            fail("Expected exception to propogate when binder fails to link to death");

        } catch (RuntimeException expected) {

        }

    }

    @Test