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

Commit db5e7e1c authored by Zhi Dou's avatar Zhi Dou Committed by Automerger Merge Worker
Browse files

Merge "capture NoClassDefFoundError" into main am: 38b8018b am: ba96b01e 

Original change: https://android-review.googlesource.com/c/platform/build/+/3369318



Change-Id: I01f80a327bb1b2fe581be9868dad9372f59927e0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 68a0209e ba96b01e

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

+3 −0
Original line number Diff line number Diff line
@@ -531,6 +531,9 @@ mod tests { 
                    disabledRwInOtherNamespace = reader.getBooleanFlagValue(3);

                } catch (Exception e) {

                    // pass

                } catch (NoClassDefFoundError e) {

                    // for mainline module running on older devices.

                    // This should be replaces to version check, after the version bump.

                }

                isCached = true;

            }

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

+3 −0
Original line number Diff line number Diff line
@@ -29,6 +29,9 @@ public final class FeatureFlagsImpl implements FeatureFlags \{ 
            {{ -endfor }}

        } catch (Exception e) \{

            // pass

        } catch (NoClassDefFoundError e) \{

            // for mainline module running on older devices.

            // This should be replaces to version check, after the version bump.

        }

        isCached = true;

    }