From f3bed30575b3bf88db64145a89c6b4f3ae059fdf Mon Sep 17 00:00:00 2001 From: Jiashen Wang Date: Thu, 28 Jan 2021 16:54:16 -0800 Subject: [PATCH] Change Settings to be able to receive timeout values from LPA Bug: 171846124 Test: Tested manually Change-Id: Ib13aa832e186ae964069d888c1c4b8321a0f7fc1 --- core/java/android/provider/Settings.java | 18 ++++++++++++++++++ .../android/provider/SettingsBackupTest.java | 2 ++ 2 files changed, 20 insertions(+) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 79f055e882aa6..c73f8d2c4cc55 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -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 diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index efd941e3bd18d..438cec8ef68f6 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -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,