Merge "Check for file readability in AconfigFlags" into main (29ebd786) · Commits · e / os / android_frameworks_base

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

+9 −2

Original line number	Diff line number	Diff line
		@@ -80,7 +80,11 @@ public class AconfigFlags {
		(Process.myUid() == Process.SYSTEM_UID) ? DeviceProtos.parsedFlagsProtoPaths()
		: Arrays.asList(DeviceProtos.PATHS);
		for (String fileName : defaultFlagProtoFiles) {
		try (var inputStream = new FileInputStream(fileName)) {
		final File protoFile = new File(fileName);
		if (!protoFile.isFile() \|\| !protoFile.canRead()) {
		continue;
		}
		try (var inputStream = new FileInputStream(protoFile)) {
		loadAconfigDefaultValues(inputStream.readAllBytes());
		} catch (IOException e) {
		Slog.w(LOG_TAG, "Failed to read Aconfig values from " + fileName, e);
		@@ -120,6 +124,9 @@ public class AconfigFlags {

		final var settingsFile = new File(Environment.getUserSystemDirectory(0),
		"settings_config.xml");
		if (!settingsFile.isFile() \|\| !settingsFile.canRead()) {
		return;
		}
		try (var inputStream = new FileInputStream(settingsFile)) {
		TypedXmlPullParser parser = Xml.resolvePullParser(inputStream);
		if (parser.next() != XmlPullParser.END_TAG && "settings".equals(parser.getName())) {
		@@ -186,7 +193,7 @@ public class AconfigFlags {
		}
		}
		} catch (IOException \| XmlPullParserException e) {
		Slog.e(LOG_TAG, "Failed to read Aconfig values from settings_config.xml", e);
		Slog.w(LOG_TAG, "Failed to read Aconfig values from settings_config.xml", e);
		}
		}