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

Commit 8ead010c authored by Zoey Chen's avatar Zoey Chen Committed by android-build-merger
Browse files

Merge "[Settings] Replace #getServiceStateForSubscriber with #getServiceState" 

am: e8cf63dd

Change-Id: I1bd0fc19e4150e26ebd2418b0c2b3b7dca41e605
parents 4359db04 e8cf63dd

src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java

+2 −1
Original line number Diff line number Diff line
@@ -149,7 +149,8 @@ public class RenameMobileNetworkDialogFragment extends InstrumentedDialogFragmen 
        }



        final TextView operatorName = view.findViewById(R.id.operator_name_value);

        final ServiceState serviceState = mTelephonyManager.getServiceStateForSubscriber(mSubId);

        mTelephonyManager = mTelephonyManager.createForSubscriptionId(mSubId);

        final ServiceState serviceState = mTelephonyManager.getServiceState();

        operatorName.setText(serviceState.getOperatorAlphaLong());



        final TextView phoneTitle = view.findViewById(R.id.number_label);

tests/robotests/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragmentTest.java

+2 −1
Original line number Diff line number Diff line
@@ -86,7 +86,8 @@ public class RenameMobileNetworkDialogFragmentTest { 


        final ServiceState serviceState = mock(ServiceState.class);

        when(serviceState.getOperatorAlphaLong()).thenReturn("fake carrier name");

        when(mTelephonyMgr.getServiceStateForSubscriber(mSubscriptionId)).thenReturn(serviceState);

        when(mTelephonyMgr.createForSubscriptionId(anyInt())).thenReturn(mTelephonyMgr);

        when(mTelephonyMgr.getServiceState()).thenReturn(serviceState);

    }



    @Test