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

Commit 55839206 authored by Tim Van Patten's avatar Tim Van Patten
Browse files

gpuservice: Always reset feature overrides when parsing 

Always call resetFeatureOverrides() at the start of
parseFeatureOverrides() to remove stale values before adding the newly
parsed values.

Bug: 372694741
Test: atest gpuservice_unittest:FeatureOverrideParserTest
Test: CQ, Manual verification
Flag: com.android.graphics.graphicsenv.flags.feature_overrides
Change-Id: Ie365dd2ffd648089a808f034fde5cc6886570cb8
parent 9af0a068

services/gpuservice/feature_override/FeatureOverrideParser.cpp

+3 −1
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ bool FeatureOverrideParser::shouldReloadFeatureOverrides() const { 
}



void FeatureOverrideParser::forceFileRead() {

    resetFeatureOverrides(mFeatureOverrides);

    mLastProtobufReadTime = 0;

}
@@ -98,6 +97,9 @@ void FeatureOverrideParser::parseFeatureOverrides() { 
    const feature_override::FeatureOverrideProtos overridesProtos = readFeatureConfigProtos(

            getFeatureOverrideFilePath());



    // Clear out the stale values before adding the newly parsed data.

    resetFeatureOverrides(mFeatureOverrides);



    // Global feature overrides.

    for (const auto &featureConfigProto: overridesProtos.global_features()) {

        FeatureConfig featureConfig;