diff options
| -rw-r--r-- | tools/aconfig/aconfig/src/codegen/java.rs | 11 | ||||
| -rw-r--r-- | tools/aconfig/aconfig/templates/FeatureFlags.java.template | 2 | ||||
| -rw-r--r-- | tools/aconfig/aconfig/templates/FeatureFlagsImpl.java.template | 17 |
3 files changed, 16 insertions, 14 deletions
diff --git a/tools/aconfig/aconfig/src/codegen/java.rs b/tools/aconfig/aconfig/src/codegen/java.rs index a34166d51d..47d4042a2e 100644 --- a/tools/aconfig/aconfig/src/codegen/java.rs +++ b/tools/aconfig/aconfig/src/codegen/java.rs @@ -531,15 +531,16 @@ mod tests { private static boolean enabledRw = true; private void init() { StorageInternalReader reader = null; + boolean foundPackage = true; try { reader = new StorageInternalReader("system", "com.android.aconfig.test"); - disabledRw = reader.getBooleanFlagValue(1); - disabledRwExported = reader.getBooleanFlagValue(2); - enabledRw = reader.getBooleanFlagValue(8); - disabledRwInOtherNamespace = reader.getBooleanFlagValue(3); } catch (Exception e) { - throw new RuntimeException("Cannot read flag in codegen", e); + foundPackage = false; } + disabledRw = foundPackage ? reader.getBooleanFlagValue(1) : false; + disabledRwExported = foundPackage ? reader.getBooleanFlagValue(2) : false; + enabledRw = foundPackage ? reader.getBooleanFlagValue(8) : true; + disabledRwInOtherNamespace = foundPackage ? reader.getBooleanFlagValue(3) : false; isCached = true; } private void load_overrides_aconfig_test() { diff --git a/tools/aconfig/aconfig/templates/FeatureFlags.java.template b/tools/aconfig/aconfig/templates/FeatureFlags.java.template index 38c8f13aaf..d2799b2474 100644 --- a/tools/aconfig/aconfig/templates/FeatureFlags.java.template +++ b/tools/aconfig/aconfig/templates/FeatureFlags.java.template @@ -19,4 +19,4 @@ public interface FeatureFlags \{ {{ -endif }} boolean {item.method_name}(); {{ -endfor }} -}
\ No newline at end of file +} diff --git a/tools/aconfig/aconfig/templates/FeatureFlagsImpl.java.template b/tools/aconfig/aconfig/templates/FeatureFlagsImpl.java.template index d1cf191e29..26d3069fd8 100644 --- a/tools/aconfig/aconfig/templates/FeatureFlagsImpl.java.template +++ b/tools/aconfig/aconfig/templates/FeatureFlagsImpl.java.template @@ -36,18 +36,19 @@ public final class FeatureFlagsImpl implements FeatureFlags \{ {{ if not library_exported }} private void init() \{ StorageInternalReader reader = null; + boolean foundPackage = true; try \{ reader = new StorageInternalReader("{container}", "{package_name}"); -{{ for namespace_with_flags in namespace_flags }} -{{ -for flag in namespace_with_flags.flags }} -{{ if flag.is_read_write }} - {flag.method_name} = reader.getBooleanFlagValue({flag.flag_offset}); -{{ endif }} -{{ -endfor }} -{{ -endfor }} } catch (Exception e) \{ - throw new RuntimeException("Cannot read flag in codegen", e); + foundPackage = false; } + {{ for namespace_with_flags in namespace_flags }} + {{ -for flag in namespace_with_flags.flags }} + {{ if flag.is_read_write }} + {flag.method_name} = foundPackage ? reader.getBooleanFlagValue({flag.flag_offset}) : {flag.default_value}; + {{ endif }} + {{ -endfor }} + {{ -endfor }} isCached = true; } {{ endif }} |