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

Commit 28953289 authored by Chen Xu's avatar Chen Xu Committed by Gerrit Code Review
Browse files

Merge "[DO NOT MERGE] fix unit test due to merge issue"

parents b5bba951 5db9e3b5

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

+1 −1
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ public abstract class TelephonyTest { 
        doReturn(mImsExternalCallTracker).when(mTelephonyComponentFactory)

                .makeImsExternalCallTracker(any(ImsPhone.class));

        doReturn(mCarrierSignalAgent).when(mTelephonyComponentFactory)

                .makeCarrierActionAgent(any(Phone.class));

                .makeCarrierSignalAgent(any(Phone.class));

        doReturn(mCarrierActionAgent).when(mTelephonyComponentFactory)

                .makeCarrierActionAgent(any(Phone.class));