summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2020-04-29 21:29:37 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2020-04-29 21:29:37 +0000
commitc042e448136d42f98bc45a7028fdb36713ff51dc (patch)
tree518b79fa80f285852f93682267764a7dca462f9e
parentabbe6d35caf326fca88a01c68a101d428b23f76d (diff)
parent18556095b9cc5c179320bc77bfe52684c2ce9630 (diff)
Merge "API to get hardware variant (SKU)"
-rw-r--r--api/current.txt1
-rwxr-xr-xcore/java/android/os/Build.java6
2 files changed, 7 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index e14821a66f0d..d5fe8cd585e8 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -34538,6 +34538,7 @@ package android.os {
field public static final String PRODUCT;
field @Deprecated public static final String RADIO;
field @Deprecated public static final String SERIAL;
+ field @NonNull public static final String SKU;
field public static final String[] SUPPORTED_32_BIT_ABIS;
field public static final String[] SUPPORTED_64_BIT_ABIS;
field public static final String[] SUPPORTED_ABIS;
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index eb67492483f1..0f53d4f84920 100755
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -106,6 +106,12 @@ public class Build {
public static final String HARDWARE = getString("ro.hardware");
/**
+ * The hardware variant (SKU), if available.
+ */
+ @NonNull
+ public static final String SKU = getString("ro.boot.product.hardware.sku");
+
+ /**
* Whether this build was for an emulator device.
* @hide
*/