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

Merge "API to get SOC manufacturer and model" am: a6b77e3294 am: 5fe83ca052 am: b5d864ee38

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2877e0aa0be6621b17932056f7d2f686b7964676
This commit is contained in:
Oliver Woodman
2021-01-28 10:54:23 +00:00
committed by Automerger Merge Worker
parent ebb573baeb b5d864ee38
commit d58d038b1d
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/current.txt
View File

@@ -30191,6 +30191,8 @@ package android.os {
field @Deprecated public static final String RADIO;
field @Deprecated public static final String SERIAL;
field @NonNull public static final String SKU;
field @NonNull public static final String SOC_MANUFACTURER;
field @NonNull public static final String SOC_MODEL;
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;

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

@@ -27,6 +27,7 @@ import android.app.ActivityThread;
import android.app.Application;
import android.compat.annotation.UnsupportedAppUsage;
import android.content.Context;
import android.sysprop.SocProperties;
import android.sysprop.TelephonyProperties;
import android.text.TextUtils;
import android.util.Slog;
@@ -88,6 +89,14 @@ public class Build {
/** The end-user-visible name for the end product. */
public static final String MODEL = getString("ro.product.model");
/** The manufacturer of the device's primary system-on-chip. */
@NonNull
public static final String SOC_MANUFACTURER = SocProperties.soc_manufacturer().orElse(UNKNOWN);
/** The model name of the device's primary system-on-chip. */
@NonNull
public static final String SOC_MODEL = SocProperties.soc_model().orElse(UNKNOWN);
/** The system bootloader version number. */
public static final String BOOTLOADER = getString("ro.bootloader");