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

Commit a1248d31 authored by Alex Lin's avatar Alex Lin Committed by Android (Google) Code Review
Browse files

Merge "Add country blacklist support"

parents 182f2179 7dd53c9a

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -7078,6 +7078,8 @@ package android.provider { 
    field public static final String DEVICE_DEMO_MODE = "device_demo_mode";

    field public static final String DEVICE_PROVISIONING_MOBILE_DATA_ENABLED = "device_provisioning_mobile_data";

    field public static final String EUICC_PROVISIONED = "euicc_provisioned";

    field public static final String EUICC_SUPPORTED_COUNTRIES = "euicc_supported_countries";

    field public static final String EUICC_UNSUPPORTED_COUNTRIES = "euicc_unsupported_countries";

    field public static final String INSTALL_CARRIER_APP_NOTIFICATION_PERSISTENT = "install_carrier_app_notification_persistent";

    field public static final String INSTALL_CARRIER_APP_NOTIFICATION_SLEEP_MILLIS = "install_carrier_app_notification_sleep_millis";

    field public static final String OTA_DISABLE_AUTOMATIC_UPDATE = "ota_disable_automatic_update";

core/java/android/provider/Settings.java

+22 −3
Original line number Diff line number Diff line
@@ -8918,13 +8918,32 @@ 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.

































packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java



+1
−0




























Original line number
Diff line number
Diff line








@@ -268,6 +268,7 @@ public class SettingsBackupTest {













                    Settings.Global.ERROR_LOGCAT_PREFIX,















                    Settings.Global.EUICC_PROVISIONED,















                    Settings.Global.EUICC_SUPPORTED_COUNTRIES,













                    Settings.Global.EUICC_UNSUPPORTED_COUNTRIES,















                    Settings.Global.EUICC_FACTORY_RESET_TIMEOUT_MILLIS,















                    Settings.Global.EUICC_REMOVING_INVISIBLE_PROFILES_TIMEOUT_MILLIS,















                    Settings.Global.FANCY_IME_ANIMATIONS,