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

Commit 96c7db48 authored by Ted Bauer's avatar Ted Bauer
Browse files

Treat undefined flags as false in resource flag processor 

Change-Id: I4ecd2a8d6306d5449c4508165234cb289e29f537
Merged-In: I978c837f13605d3958b176dec95565fdab1080a5
Bug: 373685244 
Test: atest PackageParserTest
parent 47fd3302

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

+2 −6
Original line number Diff line number Diff line
@@ -218,16 +218,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;