commit 247988066c00594ba1b1f8327c38e21b1785d6dd
author Artur Satayev <satayev@google.com> Mon Feb 14 12:25:22 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Feb 14 12:25:22 2022 +0000
tree f08a7af894083644d042bafcc9c95ba759175c2b
parent 863e8c2eaa2d3833fc27c290dcecde6ff1b5cdf6
parent 19c5ee8bf128cfee23cfa541e8c84fa32e01a251

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

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

Change-Id: I2e79f4e4a522d25309d27cc85e4164422b47a219

core/java/android/os/Build.java

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", ",");