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

Commit 8d0c05a1 authored by Chiachang Wang's avatar Chiachang Wang Committed by android-build-merger
Browse files

Prevent wtf crash test app

am: 5877916a

Change-Id: I5a219744dac7707b9198f85e74609b4841af0979
parents 55bf8f4f 5877916a
Loading
Loading
Loading
Loading
+9 −0
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ import android.net.INetd;
import android.net.MarkMaskParcel;
import android.net.Network;
import android.net.netlink.StructNlMsgHdr;
import android.util.Log;
import android.util.Log.TerribleFailureHandler;

import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;
@@ -198,9 +200,15 @@ public class TcpSocketTrackerTest {
    @Mock private INetd mNetd;
    private MockitoSession mSession;
    @Mock NetworkShim mNetworkShim;
    private TerribleFailureHandler mOldWtfHandler;

    @Before
    public void setUp() throws Exception {
        MockitoAnnotations.initMocks(this);
        // Override the default TerribleFailureHandler, as that handler might terminate the process
        // (if we're on an eng build).
        mOldWtfHandler =
                Log.setWtfHandler((tag, what, system) -> Log.e(tag, what.getMessage(), what));
        when(mDependencies.getNetd()).thenReturn(mNetd);
        when(mDependencies.isTcpInfoParsingSupported()).thenReturn(true);
        when(mDependencies.connectToKernel()).thenReturn(mMockFd);
@@ -222,6 +230,7 @@ public class TcpSocketTrackerTest {
    @After
    public void tearDown() {
        mSession.finishMocking();
        Log.setWtfHandler(mOldWtfHandler);
    }

    private MarkMaskParcel makeMarkMaskParcel(final int mask, final int mark) {