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

Commit 25a31ae6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "DO NOT MERGE Fixed the mering error" into main

parents 094cdb22 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,