diff options
| author | Alex Lin <wwl@google.com> | 2019-12-05 23:37:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-12-05 23:37:04 +0000 |
| commit | a1248d313cbbeab7f51b56ef5a2ab5788c495239 (patch) | |
| tree | f4ca135e5cb1fc825df73abb8deaf99e37d9ddfd /core/java/android | |
| parent | 182f21798ffd5d808112026937d598e4ff6fe45a (diff) | |
| parent | 7dd53c9aef98dddf049b5c2e4447e6e04238784c (diff) | |
Merge "Add country blacklist support"
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 fa8896ebea80..e2f4ee4fe498 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -8918,14 +8918,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) |