Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 666d5776 authored by Bonian Chen's avatar Bonian Chen Committed by Automerger Merge Worker
Browse files

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

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

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

Change-Id: I3b894ec349f0f17b7a5cdb4d5d6a4a5d90d67523
parents 7759f963 fdab21ba

src/com/android/settings/network/telephony/MobileNetworkUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ public class MobileNetworkUtils { 
        final ContentResolver cr = context.getContentResolver();

        final boolean esimIgnoredDevice =

                Arrays.asList(TextUtils.split(SystemProperties.get(KEY_ESIM_CID_IGNORE, ""), ","))

                        .contains(SystemProperties.get(KEY_CID, null));

                        .contains(SystemProperties.get(KEY_CID));

        final boolean enabledEsimUiByDefault =

                SystemProperties.getBoolean(KEY_ENABLE_ESIM_UI_BY_DEFAULT, true);

        final boolean euiccProvisioned =