Merge "[Ravenwood] Update core property access check" into main (07e44045) · Commits · e / os / android_frameworks_base

ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodSystemProperties.java

+21 −22

Original line number	Diff line number	Diff line
		@@ -132,9 +132,10 @@ public class RavenwoodSystemProperties {
		}

		private static boolean isKeyReadable(String key) {
		final String root = getKeyRoot(key);
		// All writable keys are also readable
		if (isKeyWritable(key)) return true;

		if (root.startsWith("debug.")) return true;
		final String root = getKeyRoot(key);

		// This set is carefully curated to help identify situations where a test may
		// accidentally depend on a default value of an obscure property whose owner hasn't
		@@ -145,26 +146,24 @@ public class RavenwoodSystemProperties {
		if (root.startsWith("soc.")) return true;
		if (root.startsWith("system.")) return true;

		// For PropertyInvalidatedCache
		if (root.startsWith("cache_key.")) return true;

		switch (key) {
		case "gsm.version.baseband":
		case "no.such.thing":
		case "qemu.sf.lcd_density":
		case "ro.bootloader":
		case "ro.debuggable":
		case "ro.hardware":
		case "ro.hw_timeout_multiplier":
		case "ro.odm.build.media_performance_class":
		case "ro.sf.lcd_density":
		case "ro.treble.enabled":
		case "ro.vndk.version":
		case "ro.icu.data.path":
		return true;
		}

		return false;
		// All core values should be readable
		if (sDefaultValues.containsKey(key)) return true;

		// Hardcoded allowlist
		return switch (key) {
		case "gsm.version.baseband",
		"no.such.thing",
		"qemu.sf.lcd_density",
		"ro.bootloader",
		"ro.hardware",
		"ro.hw_timeout_multiplier",
		"ro.odm.build.media_performance_class",
		"ro.sf.lcd_density",
		"ro.treble.enabled",
		"ro.vndk.version",
		"ro.icu.data.path" -> true;
		default -> false;
		};
		}

		private static boolean isKeyWritable(String key) {