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

Commit 469b124b authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

DO NOT MERGE Fixed the mering error am: e1ccdfff 

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



Change-Id: I57c4bd2495cd9a9d612046801572de13a10be6de
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f07465d9 e1ccdfff

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

+4 −0
Original line number Diff line number Diff line
@@ -232,6 +232,10 @@ public class ServiceStateTrackerTest extends TelephonyTest { 
        mSubInfoInternal = new SubscriptionInfoInternal.Builder().setId(1).build();

        mServiceStateStats = Mockito.mock(ServiceStateStats.class);



        mContextFixture.putResource(R.string.kg_text_message_separator, " \u2014 ");



        doReturn(mSubInfoInternal).when(mSubscriptionManagerService)

                .getSubscriptionInfoInternal(anyInt());

        mContextFixture.putResource(R.string.config_wwan_network_service_package,

                "com.android.phone");

        mContextFixture.putResource(R.string.config_wlan_network_service_package,