diff options
| author | 2020-12-14 16:41:47 +0000 | |
|---|---|---|
| committer | 2020-12-14 16:41:47 +0000 | |
| commit | 15377d9af80bd700bd7bdbcce134888c3494434a (patch) | |
| tree | f3b9455a866218147d7523b7e8627814af7c5545 | |
| parent | 09e60056e26b5c1bcb82357046a8194ba0d7c820 (diff) | |
| parent | d4e9c105b99c9812f944ccec31ecca6f1a203644 (diff) | |
Merge "Add another property for the ODM SKU (ro.boot.product.*)" am: 9b432d22a4 am: 42f9775b38 am: d4e9c105b9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1487596
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2b452c50a0876bd1c0070c6665237890159b6c68
| -rw-r--r-- | core/api/current.txt | 1 | ||||
| -rwxr-xr-x | core/java/android/os/Build.java | 14 |
2 files changed, 14 insertions, 1 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 9b7118d098bd..92d5298bb6b9 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -29927,6 +29927,7 @@ package android.os { field public static final String ID; field public static final String MANUFACTURER; field public static final String MODEL; + field @NonNull public static final String ODM_SKU; field public static final String PRODUCT; field @Deprecated public static final String RADIO; field @Deprecated public static final String SERIAL; diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java index bd18150da201..8148c457ec99 100755 --- a/core/java/android/os/Build.java +++ b/core/java/android/os/Build.java @@ -107,12 +107,24 @@ public class Build { public static final String HARDWARE = getString("ro.hardware"); /** - * The hardware variant (SKU), if available. + * The SKU of the hardware (from the kernel command line). The SKU is reported by the bootloader + * to configure system software features. */ @NonNull public static final String SKU = getString("ro.boot.hardware.sku"); /** + * The SKU of the device as set by the original design manufacturer (ODM). This is a + * runtime-initialized property set during startup to configure device services. + * + * <p>The ODM SKU may have multiple variants for the same system SKU in case a manufacturer + * produces variants of the same design. For example, the same build may be released with + * variations in physical keyboard and/or display hardware, each with a different ODM SKU. + */ + @NonNull + public static final String ODM_SKU = getString("ro.boot.product.hardware.sku"); + + /** * Whether this build was for an emulator device. * @hide */ |