Merge "gpuservice: Always reset feature overrides when parsing" into main (d9a1a057) · Commits · e / os / android_frameworks_native

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;