Merge "Fix settings to properties mapper" into main (293d0839) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/SettingsToPropertiesMapper.java

+13 −8

Original line number	Diff line number	Diff line
		@@ -232,13 +232,17 @@ public class SettingsToPropertiesMapper {
		*/
		static void sendAconfigdRequests(ProtoOutputStream requests) {
		ProtoInputStream returns = sendAconfigdRequests("aconfigd_system", requests);
		if (returns != null) {
		try {
		parseAndLogAconfigdReturn(returns);
		} catch (IOException ioe) {
		logErr("failed to parse aconfigd return", ioe);
		}
		}

		if (enableAconfigdFromMainline()) {
		returns = sendAconfigdRequests("aconfigd_mainline", requests);
		if (returns != null) {
		try {
		parseAndLogAconfigdReturn(returns);
		} catch (IOException ioe) {
		@@ -246,6 +250,7 @@ public class SettingsToPropertiesMapper {
		}
		}
		}
		}

		/**
		* apply flag local override in aconfig new storage