Fix the NullPointException
The subscriptionInfo.getCarrierName may be a null, so adding the null
checking.
Bug: 236064286
Test: build pass
Change-Id: I8f6f5ac725d6dd552ac2626725e44f52dcbf6c32
diff --git a/src/com/android/settings/ResetNetwork.java b/src/com/android/settings/ResetNetwork.java
index 854a237..7e58c0b 100644
--- a/src/com/android/settings/ResetNetwork.java
+++ b/src/com/android/settings/ResetNetwork.java
@@ -201,7 +201,8 @@
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 de92ec7..e550d19 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.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
+import android.text.TextUtils;
import android.util.Log;
import androidx.preference.Preference;
@@ -102,8 +103,8 @@
if (subInfo == null) {
return "";
}
- final String carrierName = subInfo.getCarrierName().toString();
- return carrierName;
+ CharSequence carrierName = subInfo.getCarrierName();
+ return TextUtils.isEmpty(carrierName) ? "" : carrierName.toString();
}
@Override
