Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d121fdf0 authored by Marybeth Fair's avatar Marybeth Fair Committed by Gerrit Code Review
Browse files

Merge "Return default instead of crash if package not found." into main

parents 5b149407 f5f0f63e

tools/aconfig/aconfig/src/codegen/java.rs

+6 −5
Original line number Diff line number Diff line
@@ -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() {

tools/aconfig/aconfig/templates/FeatureFlagsImpl.java.template

+9 −8
Original line number Diff line number Diff line
@@ -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}");

        } catch (Exception 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} = reader.getBooleanFlagValue({flag.flag_offset});

            {flag.method_name} = foundPackage ? reader.getBooleanFlagValue({flag.flag_offset}) : {flag.default_value};

        {{ endif }}

        {{ -endfor }}

        {{ -endfor }}

        } catch (Exception e) \{

            throw new RuntimeException("Cannot read flag in codegen", e);

        }

        isCached = true;

    }

{{ endif }}

tools/aconfig/aconfig/templates/FeatureFlags.java.template

+1 −1

File changed.

Contains only whitespace changes.