| commit | fc3ddb2f161ee92c6812fef3b4b08a89b796dcd3 | [log] [tgz] |
|---|---|---|
| author | zoey chen <zoeychen@google.com> | Tue Dec 24 17:42:13 2019 +0800 |
| committer | zoey chen <zoeychen@google.com> | Thu Dec 26 17:12:42 2019 +0800 |
| tree | 55c80a9fab3c82151e8f40f2831f05c12d17a97e | |
| parent | e29ca94af4ae50a97a0a3d523eb1cd3db0bb9264 [diff] |
[Settings] Replace #getServiceStateForSubscriber with #getServiceState Bug: 146821501 Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=RenameMobileNetworkDialogFragmentTest Change-Id: I8a1819b70a8d4ec56ae40f2b8b613bcd65a12b11 Merged-In: I8a1819b70a8d4ec56ae40f2b8b613bcd65a12b11
diff --git a/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java b/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java index 2085cdf..a0c9859 100644 --- a/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java +++ b/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java
@@ -149,7 +149,8 @@ } 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 53b4f00..0d94928 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 @@ 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