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

Commit ff03f0cf authored by Qingxi Li's avatar Qingxi Li Committed by Android (Google) Code Review
Browse files

Merge "Add Global Settings to device whether show Carrier menu" into pi-dev

parents 850c6662 ead1271f

core/java/android/provider/Settings.java

+11 −0
Original line number Diff line number Diff line
@@ -8759,6 +8759,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.













         *













         * <p>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.

































core/tests/coretests/src/android/provider/SettingsBackupTest.java



+1
−0




























Original line number
Diff line number
Diff line








@@ -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,