diff options
| -rw-r--r-- | tools/aconfig/aconfig/src/codegen/java.rs | 14 | ||||
| -rw-r--r-- | tools/aconfig/aconfig/templates/FeatureFlagsImpl.java.template | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/tools/aconfig/aconfig/src/codegen/java.rs b/tools/aconfig/aconfig/src/codegen/java.rs index 3360ddd68b..d3f074a555 100644 --- a/tools/aconfig/aconfig/src/codegen/java.rs +++ b/tools/aconfig/aconfig/src/codegen/java.rs @@ -505,11 +505,11 @@ mod tests { try { Properties properties = DeviceConfig.getProperties("aconfig_test"); disabledRw = - properties.getBoolean("com.android.aconfig.test.disabled_rw", false); + properties.getBoolean(Flags.FLAG_DISABLED_RW, false); disabledRwExported = - properties.getBoolean("com.android.aconfig.test.disabled_rw_exported", false); + properties.getBoolean(Flags.FLAG_DISABLED_RW_EXPORTED, false); enabledRw = - properties.getBoolean("com.android.aconfig.test.enabled_rw", true); + properties.getBoolean(Flags.FLAG_ENABLED_RW, true); } catch (NullPointerException e) { throw new RuntimeException( "Cannot read value from namespace aconfig_test " @@ -527,7 +527,7 @@ mod tests { try { Properties properties = DeviceConfig.getProperties("other_namespace"); disabledRwInOtherNamespace = - properties.getBoolean("com.android.aconfig.test.disabled_rw_in_other_namespace", false); + properties.getBoolean(Flags.FLAG_DISABLED_RW_IN_OTHER_NAMESPACE, false); } catch (NullPointerException e) { throw new RuntimeException( "Cannot read value from namespace other_namespace " @@ -700,11 +700,11 @@ mod tests { try { Properties properties = DeviceConfig.getProperties("aconfig_test"); disabledRwExported = - properties.getBoolean("com.android.aconfig.test.disabled_rw_exported", false); + properties.getBoolean(Flags.FLAG_DISABLED_RW_EXPORTED, false); enabledFixedRoExported = - properties.getBoolean("com.android.aconfig.test.enabled_fixed_ro_exported", false); + properties.getBoolean(Flags.FLAG_ENABLED_FIXED_RO_EXPORTED, false); enabledRoExported = - properties.getBoolean("com.android.aconfig.test.enabled_ro_exported", false); + properties.getBoolean(Flags.FLAG_ENABLED_RO_EXPORTED, false); } catch (NullPointerException e) { throw new RuntimeException( "Cannot read value from namespace aconfig_test " diff --git a/tools/aconfig/aconfig/templates/FeatureFlagsImpl.java.template b/tools/aconfig/aconfig/templates/FeatureFlagsImpl.java.template index 6235e6946c..63c4f2de72 100644 --- a/tools/aconfig/aconfig/templates/FeatureFlagsImpl.java.template +++ b/tools/aconfig/aconfig/templates/FeatureFlagsImpl.java.template @@ -27,7 +27,7 @@ public final class FeatureFlagsImpl implements FeatureFlags \{ {{ -for flag in namespace_with_flags.flags }} {{ -if flag.is_read_write }} {flag.method_name} = - properties.getBoolean("{flag.device_config_flag}", {flag.default_value}); + properties.getBoolean(Flags.FLAG_{flag.flag_name_constant_suffix}, {flag.default_value}); {{ -endif }} {{ -endfor }} } catch (NullPointerException e) \{ |