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

Commit f9dd9dfd authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by android-build-merger
Browse files

Merge "(Cherry-pick from internal) Adapt test to change internal API...

Merge "(Cherry-pick from internal) Adapt test to change internal API SubscriptionController#getActiveSubscriptionInfoList"
am: 664ac2eb

Change-Id: I646975373dc24244074f761638919239276dbe61
parents d934d5ed 664ac2eb
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.matchers.JUnitMatchers.containsString;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Mockito.doReturn;

import android.app.Activity;
@@ -106,7 +107,8 @@ public class WifiCallingSettingUiTest {
                .when(mSubscriptionController).queryLocalInterface(anyString());
        mImsManagerInstances.put(0, mImsManager0);
        mImsManagerInstances.put(1, mImsManager1);
        doReturn(mSils).when(mSubscriptionController).getActiveSubscriptionInfoList(anyString());
        doReturn(mSils).when(mSubscriptionController).getActiveSubscriptionInfoList(anyString(),
                nullable(String.class));
        doReturn(0).when(mSubscriptionController).getPhoneId(0);
        doReturn(1).when(mSubscriptionController).getPhoneId(1);
        doReturn(0).when(mSubscriptionInfo0).getSubscriptionId();