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

Commit 34cf9e7a authored by Pechetty Sravani (xWF)'s avatar Pechetty Sravani (xWF) Committed by Android (Google) Code Review
Browse files

Revert "Treat undefined flags as false in resource flag processor" 

This reverts commit f046e957.

Reason for revert: <Droidmonitor created revert due to b/381331594.will be verified through ABTD for standard investigation.>

Change-Id: I9b67d438edbc0ae996579f886fe0d78a5a778c2b
parent f046e957

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

+7 −5
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.aconfig.nano.Aconfig.parsed_flags; 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.content.res.Flags;

import android.content.res.XmlResourceParser;

import android.os.Environment;

import android.os.Process;

import android.util.ArrayMap;
@@ -246,12 +247,13 @@ public class AconfigFlags { 
            negated = true;

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

        }

        Boolean flagValue = getFlagValue(featureFlag);

        if (flagValue == null) {

            flagValue = false;

        }

        final Boolean flagValue = getFlagValue(featureFlag);

        boolean shouldSkip = false;

        if (flagValue == negated) {

        if (flagValue == null) {

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

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

            shouldSkip = true;

        } else if (flagValue == negated) {

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

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

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