summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorRobin Lee <rgl@google.com>2020-11-04 13:30:32 +0000
committerMichael Wright <michaelwr@google.com>2020-12-04 17:10:53 +0000
commit5ecccda5fe181a744ce4a29a769e3b35ff7f4af1 (patch)
treee65a145638c85c21f524999be1bc9a8874497865 /core/java/android
parente59313abccefba25bef005d89882d9528dd48765 (diff)
Add another property for the ODM SKU (ro.boot.product.*)
The canonical SKU is set by the bootloader. ODM SKU is set by vendor-init. Change-Id: I41add97c53c0f09eb0058b78dd194a8b87cdea01 Test: atest android.os.cts.BuildTest Bug: 155840001 Bug: 151157621
Diffstat (limited to 'core/java/android')
-rwxr-xr-xcore/java/android/os/Build.java14
1 files changed, 13 insertions, 1 deletions
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index 81213294361b..913b17d415bd 100755
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -106,12 +106,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
*/