commit 4db55d2f36981cad8e5d9cb134c016daca02d01e
author Artur Satayev <satayev@google.com> Wed Feb 02 16:52:37 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 02 16:52:37 2022 +0000
tree 3ded8a500107beef77b6c98d89c38fd87efa0ad2
parent bcefef7a8c50a594e45c0c9ca0f711d54972c9ae
parent 434ef186e603238af73c21d0d8e58b688fdba620

Merge "Introduce Build.VERSION.KNOWN_CODENAMES."

core/api/system-current.txt

diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index 845020d..3c483f4 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -7830,6 +7830,7 @@
   }
 
   public static class Build.VERSION {
+    field @NonNull public static final java.util.Set<java.lang.String> KNOWN_CODENAMES;
     field @NonNull public static final String PREVIEW_SDK_FINGERPRINT;
   }
 

core/java/android/os/Build.java

diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index e519ff3..6863a0b 100755
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -31,6 +31,7 @@
 import android.sysprop.SocProperties;
 import android.sysprop.TelephonyProperties;
 import android.text.TextUtils;
+import android.util.ArraySet;
 import android.util.Slog;
 import android.view.View;
 
@@ -39,6 +40,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -396,6 +398,17 @@
          */
         public static final String CODENAME = getString("ro.build.version.codename");
 
+        /**
+         * All known codenames starting from {@link VERSION_CODES.Q}.
+         *
+         * <p>This includes in development codenames as well.
+         *
+         * @hide
+         */
+        @SystemApi
+        @NonNull public static final Set<String> KNOWN_CODENAMES =
+                new ArraySet<>(new String[]{"Q", "R", "S", "Sv2", "Tiramisu"});
+
         private static final String[] ALL_CODENAMES
                 = getStringList("ro.build.version.all_codenames", ",");