From 46f8b18446c09f930f713ce3161d6437b483eb0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timi=20Rautam=C3=A4ki?= Date: Mon, 13 Dec 2021 16:10:40 +0000 Subject: [PATCH] Settings: only set phone number if it's not empty MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Only set the phone number in Rename mobile network dialog if it's not empty in order to preserve the ´Not available´ -text. Test: m, open ´SIMs´ in settings, click Pen-icon to edit SIM, verify either mobile number or ´Not available´ -text is shown. Change-Id: I3bc1f1f4eb26cda38e5cc7a12bd4db1bf922f076 --- .../network/telephony/RenameMobileNetworkDialogFragment.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java b/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java index 5f208949e52..ec48c82ce4a 100644 --- a/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java +++ b/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java @@ -184,7 +184,10 @@ public class RenameMobileNetworkDialogFragment extends InstrumentedDialogFragmen phoneTitle.setVisibility(info.isOpportunistic() ? View.GONE : View.VISIBLE); final TextView phoneNumber = view.findViewById(R.id.number_value); - phoneNumber.setText(DeviceInfoUtils.getBidiFormattedPhoneNumber(getContext(), info)); + final String pn = DeviceInfoUtils.getBidiFormattedPhoneNumber(getContext(), info); + if (!TextUtils.isEmpty(pn)) { + phoneNumber.setText(pn); + } } @Override