Merge "Use ro.build.version.known_codenames sysprop for KNOWN_CODENAMES."
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index 29a9a93..545ae38 100755
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -412,7 +412,7 @@
*/
@SystemApi
@NonNull public static final Set<String> KNOWN_CODENAMES =
- new ArraySet<>(new String[]{"Q", "R", "S", "Sv2", "Tiramisu"});
+ new ArraySet<>(getStringList("ro.build.version.known_codenames", ","));
private static final String[] ALL_CODENAMES
= getStringList("ro.build.version.all_codenames", ",");