From 1d6cd6dd54251ee100e0f105bbcd299fbb609712 Mon Sep 17 00:00:00 2001 From: twyen Date: Tue, 5 Sep 2017 12:22:56 -0700 Subject: Load VVM config override before loading anything else The override config is used by carriers to test out different configs using a prod dialer. Previously the type was loaded before the override config, causing carriers that is not currently supported never able to force enable VVM. This CL also fixes getCarrierPackageNames() and getDisabledCapabilities() not loading the override. Bug: 65370543 Test: revived OmtpVvmCarrierConfigHelperTest PiperOrigin-RevId: 167614182 Change-Id: Ibafdaf5fdc3e948bc65656f94c4bdc7d6e97046c --- java/com/android/voicemail/impl/configui/ConfigOverrideFragment.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'java/com/android/voicemail/impl/configui') diff --git a/java/com/android/voicemail/impl/configui/ConfigOverrideFragment.java b/java/com/android/voicemail/impl/configui/ConfigOverrideFragment.java index 1624ce579..caf33df13 100644 --- a/java/com/android/voicemail/impl/configui/ConfigOverrideFragment.java +++ b/java/com/android/voicemail/impl/configui/ConfigOverrideFragment.java @@ -49,7 +49,8 @@ public class ConfigOverrideFragment extends PreferenceFragment * Any preference with key that starts with this prefix will be written to the dialer carrier * config. */ - @VisibleForTesting static final String CONFIG_OVERRIDE_KEY_PREFIX = "vvm_config_override_key_"; + @VisibleForTesting + public static final String CONFIG_OVERRIDE_KEY_PREFIX = "vvm_config_override_key_"; @Override public void onCreate(@Nullable Bundle savedInstanceState) { -- cgit v1.2.3