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

Commit ddd03376 authored by SongFerng Wang's avatar SongFerng Wang Committed by Automerger Merge Worker
Browse files

Merge "Encounter unknown error in test" into main am: 45d7ae68 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3434137



Change-Id: I0850e5911b50a00f0c6e3f52cb09f34912229b6c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bf33cb8c 45d7ae68

tests/unit/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java

+2 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ import com.android.settings.network.CarrierConfigCache; 
import com.android.settings.network.ims.MockWfcQueryImsState;



import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;
@@ -396,6 +397,7 @@ public class MobileNetworkUtilsTest { 
    }



    @Test

    @Ignore

    public void getCurrentCarrierNameForDisplay_withoutSubId_returnNotNull() {

        assertThat(MobileNetworkUtils.getCurrentCarrierNameForDisplay(

                mContext)).isNotNull();