commit c8d4c8faf8efd3616db2d1348a5e4233b29f9a2c
author Artur Satayev <satayev@google.com> Mon Feb 14 12:43:40 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Feb 14 12:43:40 2022 +0000
tree c069a4981add365968dc78402ccf5c00684f538e
parent 94324722621e85eb11394fe34a2ae8122f2260f9
parent 247988066c00594ba1b1f8327c38e21b1785d6dd

Merge "Use ro.build.version.known_codenames sysprop for KNOWN_CODENAMES." am: 19c5ee8bf1 am: 247988066c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1978331

Change-Id: Ifb3aec2d1e7aeb5aa24b6d1bf70ba6cd4fa987ed

core/java/android/os/Build.java

diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index 8f38f0e..9740fcb 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", ",");