PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "The Network name is not same as statusbar at SIM Edit page" into sc-qpr1-dev am: 11af4846b2 am: 17fb53a1ad am: e590239085

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16055430

Change-Id: I34849b225700f7ccf74f16ac5f52cf4572ccc285
This commit is contained in:
SongFerng Wang
2021-10-18 08:54:13 +00:00
committed by Automerger Merge Worker
parent b7e97e4f58 e590239085
commit fce5b4b405
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java
View File

@@ -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);