From 0a1100e6bcc098b135e0888eb70776219c135d19 Mon Sep 17 00:00:00 2001
From: satayev <satayev@google.com>
Date: Wed, 9 Feb 2022 21:57:09 +0000
Subject: [PATCH] Use ro.build.version.known_codenames sysprop for
 KNOWN_CODENAMES.

The sysprop is needed to avoid JNI when accessing KNOWN_CODENAMES
from native code.

Bug: 211747008
Test:  atest android.os.cts.BuildTest#testBuildCodenameConstants
Change-Id: I713a122655f5f8a6a2fed5cee61bbe4094acbeb8
---
 core/java/android/os/Build.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index f46f45228f07e..8b1a2eb703a4d 100755
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -407,7 +407,7 @@ public class Build {
          */
         @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", ",");