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

Fix the NullPointException

Browse Source 
The subscriptionInfo.getCarrierName may be a null, so adding the null
checking.

Bug: 236064286
Test: build pass
Change-Id: I8f6f5ac725d6dd552ac2626725e44f52dcbf6c32
This commit is contained in:
SongFerngWang
2022-06-16 09:59:16 +08:00
parent 73276b3c91
commit 5a4df243f0
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/ResetNetwork.java
View File

@@ -201,7 +201,8 @@ public class ResetNetwork extends InstrumentedFragment {
name = record.getNumber(); name = record.getNumber();
} }
if (TextUtils.isEmpty(name)) { if (TextUtils.isEmpty(name)) {
name = record.getCarrierName().toString(); CharSequence carrierName = record.getCarrierName();
name = TextUtils.isEmpty(carrierName) ? "" : carrierName.toString();
} }
if (TextUtils.isEmpty(name)) { if (TextUtils.isEmpty(name)) {
name = String.format("MCC:%s MNC:%s Slot:%s Id:%s", record.getMcc(), name = String.format("MCC:%s MNC:%s Slot:%s Id:%s", record.getMcc(),

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

@@ -22,6 +22,7 @@ import android.telephony.CarrierConfigManager;
import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import androidx.preference.Preference; import androidx.preference.Preference;
@@ -102,8 +103,8 @@ public class Enable2gPreferenceController extends TelephonyTogglePreferenceContr
if (subInfo == null) { if (subInfo == null) {
return ""; return "";
} }
final String carrierName = subInfo.getCarrierName().toString(); CharSequence carrierName = subInfo.getCarrierName();
return carrierName; return TextUtils.isEmpty(carrierName) ? "" : carrierName.toString();
} }
@Override @Override