Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix for NullPointerException in SmsMessage"

Browse Source
This commit is contained in:
Treehugger Robot
2022-11-09 19:57:14 +00:00
committed by Gerrit Code Review
parent 4ca2015e9f 086e72818a
commit 49ef1ed315
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
telephony/java/android/telephony/SmsMessage.java
View File

@@ -1092,6 +1092,11 @@ public class SmsMessage {
if (!TextUtils.isEmpty(simOperator)) { if (!TextUtils.isEmpty(simOperator)) {
for (NoEmsSupportConfig currentConfig : mNoEmsSupportConfigList) { for (NoEmsSupportConfig currentConfig : mNoEmsSupportConfigList) {
if (currentConfig == null) {
Rlog.w("SmsMessage", "hasEmsSupport currentConfig is null");
continue;
}
if (simOperator.startsWith(currentConfig.mOperatorNumber) && if (simOperator.startsWith(currentConfig.mOperatorNumber) &&
(TextUtils.isEmpty(currentConfig.mGid1) || (TextUtils.isEmpty(currentConfig.mGid1) ||
(!TextUtils.isEmpty(currentConfig.mGid1) && (!TextUtils.isEmpty(currentConfig.mGid1) &&
@@ -1155,6 +1160,7 @@ public class SmsMessage {
private static boolean mIsNoEmsSupportConfigListLoaded = false; private static boolean mIsNoEmsSupportConfigListLoaded = false;
private static boolean isNoEmsSupportConfigListExisted() { private static boolean isNoEmsSupportConfigListExisted() {
synchronized (SmsMessage.class) {
if (!mIsNoEmsSupportConfigListLoaded) { if (!mIsNoEmsSupportConfigListLoaded) {
Resources r = Resources.getSystem(); Resources r = Resources.getSystem();
if (r != null) { if (r != null) {
@@ -1163,12 +1169,14 @@ public class SmsMessage {
if ((listArray != null) && (listArray.length > 0)) { if ((listArray != null) && (listArray.length > 0)) {
mNoEmsSupportConfigList = new NoEmsSupportConfig[listArray.length]; mNoEmsSupportConfigList = new NoEmsSupportConfig[listArray.length];
for (int i = 0; i < listArray.length; i++) { for (int i = 0; i < listArray.length; i++) {
mNoEmsSupportConfigList[i] = new NoEmsSupportConfig(listArray[i].split(";")); mNoEmsSupportConfigList[i] = new NoEmsSupportConfig(
listArray[i].split(";"));
} }
} }
mIsNoEmsSupportConfigListLoaded = true; mIsNoEmsSupportConfigListLoaded = true;
} }
} }
}
if (mNoEmsSupportConfigList != null && mNoEmsSupportConfigList.length != 0) { if (mNoEmsSupportConfigList != null && mNoEmsSupportConfigList.length != 0) {
return true; return true;