From 5a4df243f0d9815dff25ccd4a05c950a52948777 Mon Sep 17 00:00:00 2001 From: SongFerngWang Date: Thu, 16 Jun 2022 09:59:16 +0800 Subject: [PATCH] Fix the NullPointException The subscriptionInfo.getCarrierName may be a null, so adding the null checking. Bug: 236064286 Test: build pass Change-Id: I8f6f5ac725d6dd552ac2626725e44f52dcbf6c32 --- src/com/android/settings/ResetNetwork.java | 3 ++- .../network/telephony/Enable2gPreferenceController.java | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) 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 de92ec7e880..e550d1944e8 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; @@ -102,8 +103,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