From ead1271f1c25ff0649239880dbc1be8ac817ef82 Mon Sep 17 00:00:00 2001 From: Qingxi Li Date: Wed, 11 Apr 2018 15:14:56 -0700 Subject: [PATCH] Add Global Settings to device whether show Carrier menu Add Global Settings EUICC_SUPPORTED_COUNTRIES. When the device enabled esim UI by default and the users in eSIM supported countries, even if eSIM is not provisioned, carrier menu will be shown. This global settings will be updated by eSIM mamanger when the phone boot up. Bug: 77638033 Test: E2E Change-Id: Ib3ac8bcdfab56d6cd7c12e48318f1794af5bc1aa --- core/java/android/provider/Settings.java | 11 +++++++++++ .../src/android/provider/SettingsBackupTest.java | 1 + 2 files changed, 12 insertions(+) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 5b7adf01ec8f6..efec47139cdde 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -8743,6 +8743,17 @@ public final class Settings { @SystemApi public static final String EUICC_PROVISIONED = "euicc_provisioned"; + /** + * List of ISO country codes in which eUICC UI is shown. Country codes should be separated + * by comma. + * + *

Used to hide eUICC UI from users who are currently in countries no carriers support + * eUICC. + * @hide + */ + //TODO(b/77914569) Changes this to System Api. + public static final String EUICC_SUPPORTED_COUNTRIES = "euicc_supported_countries"; + /** * Whether any activity can be resized. When this is true, any * activity, regardless of manifest values, can be resized for multi-window. diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java index 558e576b71aff..196f8de656f07 100644 --- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java +++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java @@ -228,6 +228,7 @@ public class SettingsBackupTest { Settings.Global.EPHEMERAL_COOKIE_MAX_SIZE_BYTES, Settings.Global.ERROR_LOGCAT_PREFIX, Settings.Global.EUICC_PROVISIONED, + Settings.Global.EUICC_SUPPORTED_COUNTRIES, Settings.Global.EUICC_FACTORY_RESET_TIMEOUT_MILLIS, Settings.Global.FANCY_IME_ANIMATIONS, Settings.Global.FORCE_ALLOW_ON_EXTERNAL,