Merge "API to get SOC manufacturer and model"

This commit is contained in:
Oliver Woodman
2021-01-28 09:07:56 +00:00
committed by Gerrit Code Review
2 changed files with 11 additions and 0 deletions

View File

@@ -29649,6 +29649,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;

View File

@@ -26,6 +26,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;
@@ -87,6 +88,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");