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

Commit d6f70029 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Mark Methods Flaky to unblock until they are fixed"

parents 2e00f4ea 27df1ecf

tests/src/com/android/server/telecom/tests/CallExtrasTest.java

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.telecom.Conference; 
import android.telecom.Connection;

import android.telecom.InCallService;

import android.telecom.ParcelableCall;

import android.support.test.filters.FlakyTest;

import android.test.suitebuilder.annotation.LargeTest;

import android.test.suitebuilder.annotation.MediumTest;
@@ -398,6 +399,7 @@ public class CallExtrasTest extends TelecomSystemTest { 
     * @throws Exception

     */

    @LargeTest

    @FlakyTest(bugId = 117751305)

    @Test

    public void testConferenceExtraOperations() throws Exception {

        ParcelableCall call = makeConferenceCall();

tests/src/com/android/server/telecom/tests/CallLogManagerTest.java

+1 −0
Original line number Diff line number Diff line
@@ -538,6 +538,7 @@ public class CallLogManagerTest extends TelecomTestCase { 
    }



    @MediumTest

    @FlakyTest(bugId = 117751305)

    @Test

    public void testLogCallDirectionIncomingWithMultiUserCapability() {

        when(mMockPhoneAccountRegistrar.getPhoneAccountUnchecked(any(PhoneAccountHandle.class)))