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

Commit e2d7a999 authored by Jiashen Wang's avatar Jiashen Wang Committed by Automerger Merge Worker
Browse files

Merge "Change Settings to be able to receive timeout values from LPA" into sc-dev am: 4419835f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13430557

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4a1a768288bca94ff51876da6cc4ce50a9515cee
parents 012ce26c 4419835f

core/java/android/provider/Settings.java

+18 −0
Original line number Diff line number Diff line
@@ -13392,6 +13392,24 @@ public final class Settings { 
        public static final String EUICC_FACTORY_RESET_TIMEOUT_MILLIS =

                "euicc_factory_reset_timeout_millis";













        /**













         * Flag to set the waiting time for euicc slot switch.













         * Type: long













         *













         * @hide













         */













        public static final String EUICC_SWITCH_SLOT_TIMEOUT_MILLIS =













                "euicc_switch_slot_timeout_millis";

























        /**













         * Flag to set the waiting time for enabling multi SIM slot.













         * Type: long













         *













         * @hide













         */













        public static final String ENABLE_MULTI_SLOT_TIMEOUT_MILLIS =













                "enable_multi_slot_timeout_millis";



























        /**















         * Flag to set the timeout for when to refresh the storage settings cached data.















         * Type: long

























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



+2
−0






























Original line number
Diff line number
Diff line








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













                    Settings.Global.SMART_REPLIES_IN_NOTIFICATIONS_FLAGS,















                    Settings.Global.SMART_SUGGESTIONS_IN_NOTIFICATIONS_FLAGS,















                    Settings.Global.ENABLE_ADB_INCREMENTAL_INSTALL_DEFAULT,













                    Settings.Global.ENABLE_MULTI_SLOT_TIMEOUT_MILLIS,















                    Settings.Global.ENHANCED_4G_MODE_ENABLED,















                    Settings.Global.EPHEMERAL_COOKIE_MAX_SIZE_BYTES,















                    Settings.Global.ERROR_LOGCAT_PREFIX,









@@ -280,6 +281,7 @@ public class SettingsBackupTest {













                    Settings.Global.EUICC_UNSUPPORTED_COUNTRIES,















                    Settings.Global.EUICC_FACTORY_RESET_TIMEOUT_MILLIS,















                    Settings.Global.EUICC_REMOVING_INVISIBLE_PROFILES_TIMEOUT_MILLIS,













                    Settings.Global.EUICC_SWITCH_SLOT_TIMEOUT_MILLIS,















                    Settings.Global.FANCY_IME_ANIMATIONS,















                    Settings.Global.FORCE_ALLOW_ON_EXTERNAL,















                    Settings.Global.FORCED_APP_STANDBY_ENABLED,