Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c9c0e76 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Address API feedback on SKU/ODM_SKU" am: 599f5459 am: 210b7a54 

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

Change-Id: I21ecac025395c23702ee59e93a72b50326798d8d
parents b293e4f9 210b7a54

core/java/android/os/Build.java

+9 −4
Original line number Diff line number Diff line
@@ -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