Merge "deprecate RADIO constant, add getRadioVersion method"
This commit is contained in:
@@ -13590,6 +13590,7 @@ package android.os {
|
||||
|
||||
public class Build {
|
||||
ctor public Build();
|
||||
method public static java.lang.String getRadioVersion();
|
||||
field public static final java.lang.String BOARD;
|
||||
field public static final java.lang.String BOOTLOADER;
|
||||
field public static final java.lang.String BRAND;
|
||||
@@ -13604,7 +13605,7 @@ package android.os {
|
||||
field public static final java.lang.String MANUFACTURER;
|
||||
field public static final java.lang.String MODEL;
|
||||
field public static final java.lang.String PRODUCT;
|
||||
field public static final java.lang.String RADIO;
|
||||
field public static final deprecated java.lang.String RADIO;
|
||||
field public static final java.lang.String SERIAL;
|
||||
field public static final java.lang.String TAGS;
|
||||
field public static final long TIME;
|
||||
|
||||
@@ -16,6 +16,8 @@
|
||||
|
||||
package android.os;
|
||||
|
||||
import com.android.internal.telephony.TelephonyProperties;
|
||||
|
||||
/**
|
||||
* Information about the current build, extracted from system properties.
|
||||
*/
|
||||
@@ -56,8 +58,16 @@ public class Build {
|
||||
/** The system bootloader version number. */
|
||||
public static final String BOOTLOADER = getString("ro.bootloader");
|
||||
|
||||
/** The radio firmware version number. */
|
||||
public static final String RADIO = getString("gsm.version.baseband");
|
||||
/**
|
||||
* The radio firmware version number.
|
||||
*
|
||||
* @deprecated The radio firmware version is frequently not
|
||||
* available when this class is initialized, leading to a blank or
|
||||
* "unknown" value for this string. Use
|
||||
* {@link #getRadioVersion} instead.
|
||||
*/
|
||||
@Deprecated
|
||||
public static final String RADIO = getString(TelephonyProperties.PROPERTY_BASEBAND_VERSION);
|
||||
|
||||
/** The name of the hardware (from the kernel command line or /proc). */
|
||||
public static final String HARDWARE = getString("ro.hardware");
|
||||
@@ -266,6 +276,14 @@ public class Build {
|
||||
public static final String USER = getString("ro.build.user");
|
||||
public static final String HOST = getString("ro.build.host");
|
||||
|
||||
/**
|
||||
* Returns the version string for the radio firmware. May return
|
||||
* null (if, for instance, the radio is not currently on).
|
||||
*/
|
||||
public static String getRadioVersion() {
|
||||
return SystemProperties.get(TelephonyProperties.PROPERTY_BASEBAND_VERSION, null);
|
||||
}
|
||||
|
||||
private static String getString(String property) {
|
||||
return SystemProperties.get(property, UNKNOWN);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user