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

Commit 2a3c0d7d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Treat undefined flags as false in resource flag processor" into main am: 95151f9d 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3390279



Change-Id: Ib332d9ec1068deae6c5466469a313ad7e2ce7cec
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 96d03551 95151f9d

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

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

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

        }

        final Boolean flagValue = getFlagValue(featureFlag);

        Boolean flagValue = getFlagValue(featureFlag);

        if (flagValue == null) {

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

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

            return true;

            flagValue = false;

        }

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

        if (flagValue == negated) {

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

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

            return true;

        }

        return false;