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

Commit 42f9775b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaffdbff94a3f3a9372761556dae9a57d471b70ae
parents a9f78078 9b432d22

core/api/current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -29588,6 +29588,7 @@ package android.os { 
    field public static final String ID;

    field public static final String ID;

    field public static final String MANUFACTURER;

    field public static final String MANUFACTURER;

    field public static final String MODEL;

    field public static final String MODEL;

    field @NonNull public static final String ODM_SKU;

    field public static final String PRODUCT;

    field public static final String PRODUCT;

    field @Deprecated public static final String RADIO;

    field @Deprecated public static final String RADIO;

    field @Deprecated public static final String SERIAL;

    field @Deprecated public static final String SERIAL;

core/java/android/os/Build.java

+13 −1
Original line number Original line Diff line number Diff line
@@ -106,11 +106,23 @@ public class Build { 
    public static final String HARDWARE = getString("ro.hardware");

    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

    @NonNull

    public static final String SKU = getString("ro.boot.hardware.sku");

    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.

     * Whether this build was for an emulator device.

     * @hide

     * @hide