Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Introduce Build.VERSION.KNOWN_CODENAMES." am: 4db55d2f36 am: 5901c38224 am: d9e5f4369e

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

Change-Id: Ib904befa95b89da857df5373033865a8e6c55c10
This commit is contained in:
Artur Satayev
2022-02-02 17:33:44 +00:00
committed by Automerger Merge Worker
parent f1bc977e8d d9e5f4369e
commit c4dcf0c319
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/system-current.txt
View File

@@ -7878,6 +7878,7 @@ package android.os {
} }
public static class Build.VERSION { 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; field @NonNull public static final String PREVIEW_SDK_FINGERPRINT;
} }

13
core/java/android/os/Build.java
View File

@@ -31,6 +31,7 @@ import android.sysprop.DeviceProperties;
import android.sysprop.SocProperties; import android.sysprop.SocProperties;
import android.sysprop.TelephonyProperties; import android.sysprop.TelephonyProperties;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.ArraySet;
import android.util.Slog; import android.util.Slog;
import android.view.View; import android.view.View;
@@ -39,6 +40,7 @@ import dalvik.system.VMRuntime;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@@ -396,6 +398,17 @@ public class Build {
*/ */
public static final String CODENAME = getString("ro.build.version.codename"); 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 private static final String[] ALL_CODENAMES
= getStringList("ro.build.version.all_codenames", ","); = getStringList("ro.build.version.all_codenames", ",");