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

Commit e30ec64f authored by Oliver Woodman's avatar Oliver Woodman Committed by Automerger Merge Worker
Browse files

Merge "API to get SOC manufacturer and model" am: a6b77e32 am: 5fe83ca0... 

Merge "API to get SOC manufacturer and model" am: a6b77e32 am: 5fe83ca0 am: b5d864ee am: d58d038b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0963befd94b418dc3ecac89e9fe7ef3cdb4c22bc
parents 9d5b28ad d58d038b

core/api/current.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -30191,6 +30191,8 @@ package android.os { 
    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;

    field @NonNull public static final String SKU;

    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_32_BIT_ABIS;

    field public static final String[] SUPPORTED_64_BIT_ABIS;

    field public static final String[] SUPPORTED_64_BIT_ABIS;

    field public static final String[] SUPPORTED_ABIS;

    field public static final String[] SUPPORTED_ABIS;

core/java/android/os/Build.java

+9 −0
Original line number Original line Diff line number Diff line
@@ -27,6 +27,7 @@ import android.app.ActivityThread; 
import android.app.Application;

import android.app.Application;

import android.compat.annotation.UnsupportedAppUsage;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.Context;

import android.content.Context;

import android.sysprop.SocProperties;

import android.sysprop.TelephonyProperties;

import android.sysprop.TelephonyProperties;

import android.text.TextUtils;

import android.text.TextUtils;

import android.util.Slog;

import android.util.Slog;
@@ -88,6 +89,14 @@ public class Build { 
    /** The end-user-visible name for the end product. */

    /** The end-user-visible name for the end product. */

    public static final String MODEL = getString("ro.product.model");

    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. */

    /** The system bootloader version number. */

    public static final String BOOTLOADER = getString("ro.bootloader");

    public static final String BOOTLOADER = getString("ro.bootloader");