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

Commit e75b8d64 authored by Brad Ebinger's avatar Brad Ebinger Committed by Gerrit Code Review
Browse files

Merge "Do not crash on ENG builds when we hit a WTF during test"

parents e5499052 0f51ab01

tests/telephonytests/AndroidTest.xml

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 
    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >

        <option name="package" value="com.android.frameworks.telephonytests" />

        <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />

        <option name="exclude-annotation" value="androidx.test.filters.FlakyTest" />

        <option name="exclude-annotation" value="org.junit.Ignore" />

        <option name="hidden-api-checks" value="false"/>

    </test>

</configuration>

tests/telephonytests/src/com/android/internal/telephony/TelephonyTest.java

+3 −1
Original line number Diff line number Diff line
@@ -443,7 +443,9 @@ public abstract class TelephonyTest { 
        MockitoAnnotations.initMocks(this);

        TelephonyManager.disableServiceHandleCaching();

        SubscriptionController.disableCaching();



        // For testing do not allow Log.WTF as it can cause test process to crash

        Log.setWtfHandler((tagString, what, system) -> logd("WTF captured, ignoring. Tag: "

                + tagString + ", exception: " + what));



        mPhones = new Phone[] {mPhone};

        mImsCallProfile = new ImsCallProfile();