Merge "Fix to show eUICC preference in eng build" am: e825c30137 am: 9e81a2f4a8 am: c4c8f51bb0

am: 1c20ea5644

Change-Id: I531faa4430a0fa914b239383d97ef5af58c8bb0b
This commit is contained in:
Taesu Lee
2019-09-25 23:35:06 -07:00
committed by android-build-merger
4 changed files with 20 additions and 6 deletions

View File

@@ -53,6 +53,7 @@ import com.android.internal.util.ArrayUtils;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.development.DevelopmentSettingsEnabler;
import com.android.settingslib.graph.SignalDrawable;
import java.util.Arrays;
@@ -224,7 +225,7 @@ public class MobileNetworkUtils {
final boolean euiccProvisioned =
Settings.Global.getInt(cr, Settings.Global.EUICC_PROVISIONED, 0) != 0;
final boolean inDeveloperMode =
Settings.Global.getInt(cr, Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0) != 0;
DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(context);
return (inDeveloperMode || euiccProvisioned
|| (!esimIgnoredDevice && enabledEsimUiByDefault && inEsimSupportedCountries));