diff options
| author | 2022-03-02 00:01:05 +0000 | |
|---|---|---|
| committer | 2022-03-02 00:01:05 +0000 | |
| commit | a789b9264445037fab1c9440785ad4a827034af9 (patch) | |
| tree | 9fc80cfac2cfc118813deb89906b4d0a09076d70 | |
| parent | 88b3357538df8c9158c95c90efd200afd9256084 (diff) | |
| parent | ef48689e323b1dbfaee8f8502d720a9b10c93f09 (diff) | |
Merge "Add Build.Version.RELEASE_OR_PREVIEW_DISPLAY"
| -rw-r--r-- | core/api/current.txt | 1 | ||||
| -rwxr-xr-x | core/java/android/os/Build.java | 11 |
2 files changed, 10 insertions, 2 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index e0eccf4fc1f3..d02c7abfe802 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -29495,6 +29495,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; diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java index 545ae38c38c0..03492aa56631 100755 --- a/core/java/android/os/Build.java +++ b/core/java/android/os/Build.java @@ -285,13 +285,20 @@ 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. */ public static final String BASE_OS = SystemProperties.get("ro.build.version.base_os", ""); |