diff options
| author | Alex Lin <wwl@google.com> | 2019-11-20 16:32:07 -0800 |
|---|---|---|
| committer | Alex Lin <wwl@google.com> | 2019-12-04 13:53:25 -0800 |
| commit | 7dd53c9aef98dddf049b5c2e4447e6e04238784c (patch) | |
| tree | daf1fa28940235991b3e664ade2bfe69e52bcfca /core/java/android | |
| parent | 2c3266578224fa9fdbb8bdb0fba3dba51925de68 (diff) | |
Add country blacklist support
Adding a country blacklist, except for pixel2(walleye, taimen) will still uses whitelist
Bug: 144702079
Test: manually tested
Change-Id: I21c146556e5406ecf5c72f74767ea8d5fc643aec
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/provider/Settings.java | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 3ac7deb0db08..8aa0a9ef0ca9 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -8846,14 +8846,33 @@ public final class Settings { * List of ISO country codes in which eUICC UI is shown. Country codes should be separated * by comma. * - * <p>Used to hide eUICC UI from users who are currently in countries no carriers support - * eUICC. + * Note: if {@link #EUICC_SUPPORTED_COUNTRIES} is empty, then {@link + * #EUICC_UNSUPPORTED_COUNTRIES} is used. + * + * <p>Used to hide eUICC UI from users who are currently in countries where no carriers + * support eUICC. + * * @hide */ - //TODO(b/77914569) Changes this to System Api. + @SystemApi public static final String EUICC_SUPPORTED_COUNTRIES = "euicc_supported_countries"; /** + * List of ISO country codes in which eUICC UI is not shown. Country codes should be + * separated by comma. + * + * Note: if {@link #EUICC_SUPPORTED_COUNTRIES} is empty, then {@link + * #EUICC_UNSUPPORTED_COUNTRIES} is used. + * + * <p>Used to hide eUICC UI from users who are currently in countries where no carriers + * support eUICC. + * + * @hide + */ + @SystemApi + public static final String EUICC_UNSUPPORTED_COUNTRIES = "euicc_unsupported_countries"; + + /** * Whether any activity can be resized. When this is true, any * activity, regardless of manifest values, can be resized for multi-window. * (0 = false, 1 = true) |