From fc3ddb2f161ee92c6812fef3b4b08a89b796dcd3 Mon Sep 17 00:00:00 2001 From: zoey chen Date: Tue, 24 Dec 2019 17:42:13 +0800 Subject: [PATCH] [Settings] Replace #getServiceStateForSubscriber with #getServiceState Bug: 146821501 Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=RenameMobileNetworkDialogFragmentTest Change-Id: I8a1819b70a8d4ec56ae40f2b8b613bcd65a12b11 Merged-In: I8a1819b70a8d4ec56ae40f2b8b613bcd65a12b11 --- .../network/telephony/RenameMobileNetworkDialogFragment.java | 3 ++- .../telephony/RenameMobileNetworkDialogFragmentTest.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java b/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java index 2085cdf3f94..a0c98596bd5 100644 --- a/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java +++ b/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java @@ -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); diff --git a/tests/robotests/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragmentTest.java b/tests/robotests/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragmentTest.java index 53b4f002698..0d94928f564 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragmentTest.java @@ -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