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

Commit 6b28f0d0 authored by Ling Ma's avatar Ling Ma Committed by Automerger Merge Worker
Browse files

Fix Telephony Test am: 55d51be9 am: 0e4aa196 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2469120



Change-Id: I5e5b9c3d952a5bafef7de937597aca959ddb61b4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents aac04a51 0e4aa196

src/java/com/android/internal/telephony/data/DataNetworkController.java

+1 −1
Original line number Diff line number Diff line
@@ -2156,7 +2156,7 @@ public class DataNetworkController extends Handler { 
     * @return The data network if found.

     */

    @Nullable

    DataNetwork getDataNetworkByInterface(@NonNull String interfaceName) {

    public DataNetwork getDataNetworkByInterface(@NonNull String interfaceName) {

        return mDataNetworkList.stream()

                .filter(dataNetwork -> !dataNetwork.isDisconnecting())

                .filter(dataNetwork -> interfaceName.equals(

tests/telephonytests/src/com/android/internal/telephony/data/PhoneSwitcherTest.java

+5 −11
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ import static org.mockito.Mockito.never; 
import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;



import android.app.NotificationManager;

import android.content.Context;

import android.content.Intent;

import android.net.ConnectivityManager;
@@ -122,7 +121,6 @@ public class PhoneSwitcherTest extends TelephonyTest { 
    private ISetOpportunisticDataCallback mSetOpptDataCallback2;

    PhoneSwitcher.ImsRegTechProvider mMockImsRegTechProvider;

    private SubscriptionInfo mSubscriptionInfo;

    private NotificationManager mNotificationManager;



    private PhoneSwitcher mPhoneSwitcherUT;

    private SubscriptionManager.OnSubscriptionsChangedListener mSubChangedListener;
@@ -158,7 +156,6 @@ public class PhoneSwitcherTest extends TelephonyTest { 
        mSetOpptDataCallback2 = mock(ISetOpportunisticDataCallback.class);

        mMockImsRegTechProvider = mock(PhoneSwitcher.ImsRegTechProvider.class);

        mSubscriptionInfo = mock(SubscriptionInfo.class);

        mNotificationManager = mock(NotificationManager.class);



        PhoneCapability phoneCapability = new PhoneCapability(1, 1, null, false, new int[0]);

        doReturn(phoneCapability).when(mPhoneConfigurationManager).getCurrentPhoneCapability();
@@ -587,7 +584,6 @@ public class PhoneSwitcherTest extends TelephonyTest { 
    @Test

    @SmallTest

    public void testAutoDataSwitchSetNotification() throws Exception {

        clearInvocations(mNotificationManager);

        SubscriptionInfo mockedInfo = mock(SubscriptionInfo.class);

        doReturn(false).when(mockedInfo).isOpportunistic();

        doReturn(mockedInfo).when(mSubscriptionController).getSubscriptionInfo(anyInt());
@@ -599,23 +595,23 @@ public class PhoneSwitcherTest extends TelephonyTest { 
        setDefaultDataSubId(1);



        testAutoSwitchToSecondarySucceed();

        clearInvocations(mSubscriptionController);

        Message.obtain(mPhoneSwitcherUT, EVENT_MODEM_COMMAND_DONE, new AsyncResult(1, null,  null))

                .sendToTarget();

        processAllMessages();

        verify(mNotificationManager).notify(eq(null), eq(AUTO_DATA_SWITCH_NOTIFICATION), any());

        verify(mSubscriptionController).getSubscriptionInfo(2);



        // switch back to primary

        clearInvocations(mSubscriptionController);

        Message.obtain(mPhoneSwitcherUT, EVENT_MODEM_COMMAND_DONE, new AsyncResult(0, null,  null))

                .sendToTarget();

        processAllMessages();

        verify(mNotificationManager).cancel(eq(null), eq(AUTO_DATA_SWITCH_NOTIFICATION));

        verify(mSubscriptionController, never()).getSubscriptionInfo(1);



        clearInvocations(mNotificationManager);

        Message.obtain(mPhoneSwitcherUT, EVENT_MODEM_COMMAND_DONE, new AsyncResult(1, null,  null))

                .sendToTarget();

        processAllMessages();

        verify(mNotificationManager, never())

                .notify(eq(null), eq(AUTO_DATA_SWITCH_NOTIFICATION), any());

        verify(mSubscriptionController, never()).getSubscriptionInfo(2);

    }



    /**
@@ -1879,8 +1875,6 @@ public class PhoneSwitcherTest extends TelephonyTest { 


        mPhoneSwitcherUT = new PhoneSwitcher(mMaxDataAttachModemCount, mContext, Looper.myLooper());

        processAllMessages();

        replaceInstance(PhoneSwitcher.class, "mNotificationManager",

                mPhoneSwitcherUT, mNotificationManager);



        Field field = PhoneSwitcher.class.getDeclaredField("mDataSettingsManagerCallbacks");

        field.setAccessible(true);

tests/telephonytests/src/com/android/internal/telephony/euicc/EuiccControllerTest.java

+3 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ import libcore.junit.util.compat.CoreCompatChangeRule.EnableCompatChanges; 


import org.junit.After;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Rule;

import org.junit.Test;

import org.junit.rules.TestRule;
@@ -611,6 +612,7 @@ public class EuiccControllerTest extends TelephonyTest { 
        assertFalse(mController.mCalledRefreshSubscriptionsAndSendResult);

    }



    @Ignore("b/255697307")

    @Test

    @DisableCompatChanges({EuiccManager.SHOULD_RESOLVE_PORT_INDEX_FOR_APPS})

    public void testDownloadSubscription_noPrivileges_hasCarrierPrivileges_multiSim()
@@ -887,6 +889,7 @@ public class EuiccControllerTest extends TelephonyTest { 
                anyBoolean(), any(), anyBoolean());

    }



    @Ignore("b/255697307")

    @Test

    @DisableCompatChanges({EuiccManager.SHOULD_RESOLVE_PORT_INDEX_FOR_APPS})

    public void testSwitchToSubscription_emptySubscription_success() throws Exception {