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

Commit 95151f9d authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Treat undefined flags as false in resource flag processor" into main

parents 47fd3302 96c7db48

core/java/com/android/internal/pm/pkg/component/AconfigFlags.java

+2 −6
Original line number Original line Diff line number Diff line
@@ -218,16 +218,12 @@ public class AconfigFlags { 
            negated = true;

            negated = true;

            featureFlag = featureFlag.substring(1).strip();

            featureFlag = featureFlag.substring(1).strip();

        }

        }

        final Boolean flagValue = getFlagValue(featureFlag);

        Boolean flagValue = getFlagValue(featureFlag);

        if (flagValue == null) {

        if (flagValue == null) {

            Slog.w(LOG_TAG, "Skipping element " + parser.getName()

            flagValue = false;

                    + " due to unknown feature flag " + featureFlag);

            return true;

        }

        }

        // Skip if flag==false && attr=="flag" OR flag==true && attr=="!flag" (negated)

        // Skip if flag==false && attr=="flag" OR flag==true && attr=="!flag" (negated)

        if (flagValue == negated) {

        if (flagValue == negated) {

            Slog.v(LOG_TAG, "Skipping element " + parser.getName()

                    + " behind feature flag " + featureFlag + " = " + flagValue);

            return true;

            return true;

        }

        }

        return false;

        return false;