diff --git a/src/com/android/settings/ResetNetwork.java b/src/com/android/settings/ResetNetwork.java index 854a2375f20..7e58c0b9808 100644 --- a/src/com/android/settings/ResetNetwork.java +++ b/src/com/android/settings/ResetNetwork.java @@ -201,7 +201,8 @@ public class ResetNetwork extends InstrumentedFragment { name = record.getNumber(); } if (TextUtils.isEmpty(name)) { - name = record.getCarrierName().toString(); + CharSequence carrierName = record.getCarrierName(); + name = TextUtils.isEmpty(carrierName) ? "" : carrierName.toString(); } if (TextUtils.isEmpty(name)) { name = String.format("MCC:%s MNC:%s Slot:%s Id:%s", record.getMcc(), diff --git a/src/com/android/settings/network/telephony/Enable2gPreferenceController.java b/src/com/android/settings/network/telephony/Enable2gPreferenceController.java index c3dcde3778a..0a35d792a89 100644 --- a/src/com/android/settings/network/telephony/Enable2gPreferenceController.java +++ b/src/com/android/settings/network/telephony/Enable2gPreferenceController.java @@ -22,6 +22,7 @@ import android.telephony.CarrierConfigManager; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; +import android.text.TextUtils; import android.util.Log; import androidx.preference.Preference; @@ -129,8 +130,8 @@ public class Enable2gPreferenceController extends TelephonyTogglePreferenceContr if (subInfo == null) { return ""; } - final String carrierName = subInfo.getCarrierName().toString(); - return carrierName; + CharSequence carrierName = subInfo.getCarrierName(); + return TextUtils.isEmpty(carrierName) ? "" : carrierName.toString(); } @Override