summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-03-31 14:09:58 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-03-31 14:09:58 +0000
commit210b7a542bb0a9cd4f8f0ebc323d652255ec3656 (patch)
tree203b753794a3edcf58997980d8e83adc5bc7d1df /core/java/android
parent1a134fbfad926d3ede05538bc2862d1ebcc92349 (diff)
parent599f5459692609ef43da8dc0ed34d4abcde02e23 (diff)
Merge "Address API feedback on SKU/ODM_SKU" am: 599f545969
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1658040 Change-Id: I77905b5632210a740895fef19090bd31e7a8c7c7
Diffstat (limited to 'core/java/android')
-rwxr-xr-xcore/java/android/os/Build.java13
1 files changed, 9 insertions, 4 deletions
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index 189a8ac55a10..03caafda2b13 100755
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -115,15 +115,20 @@ public class Build {
public static final String HARDWARE = getString("ro.hardware");
/**
- * The SKU of the hardware (from the kernel command line). The SKU is reported by the bootloader
- * to configure system software features.
+ * The SKU of the hardware (from the kernel command line).
+ *
+ * <p>The SKU is reported by the bootloader to configure system software features.
+ * If no value is supplied by the bootloader, this is reported as {@link #UNKNOWN}.
+
*/
@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.
+ * The SKU of the device as set by the original design manufacturer (ODM).
+ *
+ * <p>This is a runtime-initialized property set during startup to configure device
+ * services. If no value is set, this is reported as {@link #UNKNOWN}.
*
* <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