Merge "[Settings] Avoid from crash - SystemProp default null" into sc-qpr1-dev am: ebe477db21

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15824485

Change-Id: I38e52004ee7a1f5bf794f167d835e32c08ecb90c
This commit is contained in:
Bonian Chen
2021-09-16 19:24:09 +00:00
committed by Automerger Merge Worker

View File

@@ -288,7 +288,7 @@ public class MobileNetworkUtils {
final ContentResolver cr = context.getContentResolver(); final ContentResolver cr = context.getContentResolver();
final boolean esimIgnoredDevice = final boolean esimIgnoredDevice =
Arrays.asList(TextUtils.split(SystemProperties.get(KEY_ESIM_CID_IGNORE, ""), ",")) Arrays.asList(TextUtils.split(SystemProperties.get(KEY_ESIM_CID_IGNORE, ""), ","))
.contains(SystemProperties.get(KEY_CID, null)); .contains(SystemProperties.get(KEY_CID));
final boolean enabledEsimUiByDefault = final boolean enabledEsimUiByDefault =
SystemProperties.getBoolean(KEY_ENABLE_ESIM_UI_BY_DEFAULT, true); SystemProperties.getBoolean(KEY_ENABLE_ESIM_UI_BY_DEFAULT, true);
final boolean euiccProvisioned = final boolean euiccProvisioned =