| commit | 0ab4ba78c14c910a5988036c77adaa4f06a93417 | [log] [tgz] |
|---|---|---|
| author | Aaron Holden <aaronholden@google.com> | Sat Jul 14 20:13:25 2018 -0700 |
| committer | Aaron Holden <aaronholden@google.com> | Tue Jul 17 15:34:53 2018 -0700 |
| tree | d1020ba3c4d24cb1be0ee054fb0b069ec9f05123 | |
| parent | 0126f3d17e3312540a8965d70acadf5f548fa62a [diff] |
Require remote dynamic config by default Also fix unit tests bug: 66940640 Test: manual Change-Id: Ib304dfbf0a040b2872461f7596b44696f4e650f5
diff --git a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/util/DynamicConfigFileReaderTest.java b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/util/DynamicConfigFileReaderTest.java index a75abfd..7ceafb1 100644 --- a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/util/DynamicConfigFileReaderTest.java +++ b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/util/DynamicConfigFileReaderTest.java
@@ -58,6 +58,9 @@ private void writeDynamicConfigFile() throws IOException { String content = "<dynamicConfig>\n" + + " <entry key=\"remote_config_required\">\n" + + " <value>false</value>\n" + + " </entry>\n" + " <entry key=\"media_files_url\">\n" + " <value>some value</value>\n" + " </entry>\n" +
diff --git a/common/util/src/com/android/compatibility/common/util/DynamicConfig.java b/common/util/src/com/android/compatibility/common/util/DynamicConfig.java index d73cbc5..92bd380 100644 --- a/common/util/src/com/android/compatibility/common/util/DynamicConfig.java +++ b/common/util/src/com/android/compatibility/common/util/DynamicConfig.java
@@ -80,7 +80,7 @@ String val = mDynamicConfigMap.get(REMOTE_CONFIG_REQUIRED_KEY).get(0); return Boolean.parseBoolean(val); } - return false; + return true; // require remote configuration by default } public boolean remoteConfigRetrieved() {
diff --git a/common/util/tests/src/com/android/compatibility/common/util/DynamicConfigTest.java b/common/util/tests/src/com/android/compatibility/common/util/DynamicConfigTest.java index 99ef733..954c1ce 100644 --- a/common/util/tests/src/com/android/compatibility/common/util/DynamicConfigTest.java +++ b/common/util/tests/src/com/android/compatibility/common/util/DynamicConfigTest.java
@@ -33,6 +33,9 @@ private static final String CORRECT_CONFIG = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" + "<dynamicConfig>\n" + + " <entry key=\"remote_config_required\">\n" + + " <value>false</value>\n" + + " </entry>\n" + " <entry key=\"test-config-1\">\n" + " <value>test config 1</value>\n" + " </entry>\n" + @@ -58,6 +61,9 @@ private static final String CONFIG_WRONG_NODE_NAME = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" + "<dynamicCsonfig>\n" + //The node name dynamicConfig is intentionally mistyped + " <entry key=\"remote_config_required\">\n" + + " <value>false</value>\n" + + " </entry>\n" + " <entry key=\"test-config-1\">\n" + " <value>test config 1</value>\n" + " </entry>\n" +