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

Merge "Fix for NullPointerException in SmsMessage" am: 49ef1ed315

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2296057

Change-Id: Icb8bb64a8115a6c0def427ae150ff70556e8c437
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-11-09 20:06:43 +00:00
committed by Automerger Merge Worker
parent 644aaa561e 49ef1ed315
commit 9b12a745f4
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
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,18 +1160,21 @@ public class SmsMessage {
private static boolean mIsNoEmsSupportConfigListLoaded = false; private static boolean mIsNoEmsSupportConfigListLoaded = false;
private static boolean isNoEmsSupportConfigListExisted() { private static boolean isNoEmsSupportConfigListExisted() {
if (!mIsNoEmsSupportConfigListLoaded) { synchronized (SmsMessage.class) {
Resources r = Resources.getSystem(); if (!mIsNoEmsSupportConfigListLoaded) {
if (r != null) { Resources r = Resources.getSystem();
String[] listArray = r.getStringArray( if (r != null) {
com.android.internal.R.array.no_ems_support_sim_operators); String[] listArray = r.getStringArray(
if ((listArray != null) && (listArray.length > 0)) { com.android.internal.R.array.no_ems_support_sim_operators);
mNoEmsSupportConfigList = new NoEmsSupportConfig[listArray.length]; if ((listArray != null) && (listArray.length > 0)) {
for (int i=0; i<listArray.length; i++) { mNoEmsSupportConfigList = new NoEmsSupportConfig[listArray.length];
mNoEmsSupportConfigList[i] = new NoEmsSupportConfig(listArray[i].split(";")); for (int i = 0; i < listArray.length; i++) {
mNoEmsSupportConfigList[i] = new NoEmsSupportConfig(
listArray[i].split(";"));
}
} }
mIsNoEmsSupportConfigListLoaded = true;
} }
mIsNoEmsSupportConfigListLoaded = true;
} }
} }