Skip to content

Commit 5583920

Browse files
committed
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
1 parent 9af0a06 commit 5583920

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

services/gpuservice/feature_override/FeatureOverrideParser.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,16 @@ bool FeatureOverrideParser::shouldReloadFeatureOverrides() const {
9090
}
9191

9292
void FeatureOverrideParser::forceFileRead() {
93-
resetFeatureOverrides(mFeatureOverrides);
9493
mLastProtobufReadTime = 0;
9594
}
9695

9796
void FeatureOverrideParser::parseFeatureOverrides() {
9897
const feature_override::FeatureOverrideProtos overridesProtos = readFeatureConfigProtos(
9998
getFeatureOverrideFilePath());
10099

100+
// Clear out the stale values before adding the newly parsed data.
101+
resetFeatureOverrides(mFeatureOverrides);
102+
101103
// Global feature overrides.
102104
for (const auto &featureConfigProto: overridesProtos.global_features()) {
103105
FeatureConfig featureConfig;

0 commit comments

Comments
 (0)