From b172582c14abf47b39ee36a289a19cc2ffed0bae Mon Sep 17 00:00:00 2001 From: SongFerngWang Date: Thu, 14 Oct 2021 18:54:52 +0800 Subject: [PATCH] The Network name is not same as statusbar at SIM Edit page Using subscriptionInfo to get the network name. Bug: 203035698 Bug: 201591202 Test: make RunSettingsRoboTests ROBOTEST_FILTER=RenameMobileNetworkDialogFragmentTest (PASS) Change-Id: I84848a2801172b46f7cc3ff39d88ad57e34514a4 (cherry picked from commit 050b6d5224b078bc23b6ad212962b048d3d8a05e) --- .../telephony/RenameMobileNetworkDialogFragment.java | 5 +---- .../telephony/RenameMobileNetworkDialogFragmentTest.java | 7 +------ 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java b/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java index 8e65605eecc..5f208949e52 100644 --- a/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java +++ b/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java @@ -25,7 +25,6 @@ import android.graphics.Paint; import android.graphics.drawable.ShapeDrawable; import android.graphics.drawable.shapes.OvalShape; import android.os.Bundle; -import android.telephony.ServiceState; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; @@ -52,7 +51,6 @@ import com.android.settingslib.DeviceInfoUtils; import com.google.common.collect.ImmutableMap; -import java.util.Arrays; import java.util.List; import java.util.Map; @@ -180,8 +178,7 @@ public class RenameMobileNetworkDialogFragment extends InstrumentedDialogFragmen final TextView operatorName = view.findViewById(R.id.operator_name_value); mTelephonyManager = mTelephonyManager.createForSubscriptionId(mSubId); - final ServiceState serviceState = mTelephonyManager.getServiceState(); - operatorName.setText(serviceState == null ? "" : serviceState.getOperatorAlphaLong()); + operatorName.setText(info.getCarrierName()); final TextView phoneTitle = view.findViewById(R.id.number_label); phoneTitle.setVisibility(info.isOpportunistic() ? View.GONE : View.VISIBLE); 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 70b05981370..ea440c771e0 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragmentTest.java @@ -31,7 +31,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.DialogInterface; import android.graphics.Color; -import android.telephony.ServiceState; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; @@ -73,8 +72,6 @@ public class RenameMobileNetworkDialogFragmentTest { @Mock private TelephonyManager mTelephonyMgr; @Mock - private ServiceState mServiceState; - @Mock private SubscriptionManager mSubscriptionMgr; @Mock private SubscriptionInfo mSubscriptionInfo; @@ -95,11 +92,9 @@ public class RenameMobileNetworkDialogFragmentTest { stm.setTelephonyManagerForSubscriptionId(mSubscriptionId, mTelephonyMgr); when(mTelephonyMgr.createForSubscriptionId(anyInt())).thenReturn(mTelephonyMgr); - when(mTelephonyMgr.getServiceState()).thenReturn(mServiceState); - when(mServiceState.getOperatorAlphaLong()).thenReturn("fake carrier name"); - when(mSubscriptionInfo.getSubscriptionId()).thenReturn(mSubscriptionId); when(mSubscriptionInfo.getDisplayName()).thenReturn("test"); + when(mSubscriptionInfo.getCarrierName()).thenReturn("fake carrier name"); when(mSubscriptionMgr.setDisplayName(any(), anyInt(), anyInt())).thenReturn(0); mActivity = spy(Robolectric.buildActivity(FragmentActivity.class).setup().get());