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

Merge "Add Build.Version.RELEASE_OR_PREVIEW_DISPLAY" am: a789b92644 am: e3086a9896

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

Change-Id: I2eba7685c56d4931f63974b6bfcf13fbb2ab2345
This commit is contained in:
Colin Cross
2022-03-02 00:34:33 +00:00
committed by Automerger Merge Worker
parent 327c509933 e3086a9896
commit ffa0f38936
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/current.txt
View File

@@ -29555,6 +29555,7 @@ package android.os {
field public static final int PREVIEW_SDK_INT;
field public static final String RELEASE;
field @NonNull public static final String RELEASE_OR_CODENAME;
field @NonNull public static final String RELEASE_OR_PREVIEW_DISPLAY;
field @Deprecated public static final String SDK;
field public static final int SDK_INT;
field public static final String SECURITY_PATCH;

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

@@ -285,12 +285,19 @@ public class Build {
public static final String RELEASE = getString("ro.build.version.release");
/**
* The version string we show to the user; may be {@link #RELEASE} or
* {@link #CODENAME} if not a final release build.
* The version string. May be {@link #RELEASE} or {@link #CODENAME} if
* not a final release build.
*/
@NonNull public static final String RELEASE_OR_CODENAME = getString(
"ro.build.version.release_or_codename");
/**
* The version string we show to the user; may be {@link #RELEASE} or
* a descriptive string if not a final release build.
*/
@NonNull public static final String RELEASE_OR_PREVIEW_DISPLAY = getString(
"ro.build.version.release_or_preview_display");
/**
* The base OS build the product is based on.
*/