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

Commit e1ccdfff authored by Jack Yu's avatar Jack Yu
Browse files

DO NOT MERGE Fixed the mering error 

Fixed the merging error from aosp/2681498

Fix: 293671287
Test: atest ServiceStateTrackerTest
Change-Id: Iea14f35670075abab595d7ff2e53c873f729567b
parent 094cdb22

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

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

        mSubInfoInternal = new SubscriptionInfoInternal.Builder().setId(1).build();

        mServiceStateStats = Mockito.mock(ServiceStateStats.class);

        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,

        mContextFixture.putResource(R.string.config_wwan_network_service_package,

                "com.android.phone");

                "com.android.phone");

        mContextFixture.putResource(R.string.config_wlan_network_service_package,

        mContextFixture.putResource(R.string.config_wlan_network_service_package,