Merge "Add another property for the ODM SKU (ro.boot.product.*)" am: 9b432d22a4 am: 42f9775b38

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I42fe01edc55ca20afe9ff9761dc55be625b418ab

1 files changed, 13 insertions, 1 deletions

diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index 78ba7f0eec28..0d8769e7635c 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
      */