Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I42fe01edc55ca20afe9ff9761dc55be625b418ab
This commit is contained in:
Treehugger Robot
2020-12-14 16:27:42 +00:00
committed by Automerger Merge Worker
parent f63eee0ef9 42f9775b38
commit d4e9c105b9
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/current.txt
View File

@@ -29588,6 +29588,7 @@ package android.os {
field public static final String ID;
field public static final String MANUFACTURER;
field public static final String MODEL;
field @NonNull public static final String ODM_SKU;
field public static final String PRODUCT;
field @Deprecated public static final String RADIO;
field @Deprecated public static final String SERIAL;

14
core/java/android/os/Build.java
View File

@@ -106,11 +106,23 @@ 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