Merge "Unhide Build.SUPPORTED_ABIS and friends." (1dcdbb5a) · Commits · e / os / android_frameworks_base

api/current.txt

+5 −2

core/java/android/os/Build.java

+12 −8

Original line number	Original line	Diff line number	Diff line
	@@ -45,10 +45,20 @@ public class Build {
	/** The name of the underlying board, like "goldfish". */		/** The name of the underlying board, like "goldfish". */
	public static final String BOARD = getString("ro.product.board");		public static final String BOARD = getString("ro.product.board");

	/** The name of the instruction set (CPU type + ABI convention) of native code. */		/**
			* The name of the instruction set (CPU type + ABI convention) of native code.
			*
			* @deprecated Use {@link #SUPPORTED_ABIS} instead.
			*/
			@Deprecated
	public static final String CPU_ABI = getString("ro.product.cpu.abi");		public static final String CPU_ABI = getString("ro.product.cpu.abi");

	/** The name of the second instruction set (CPU type + ABI convention) of native code. */		/**
			* The name of the second instruction set (CPU type + ABI convention) of native code.
			*
			* @deprecated Use {@link #SUPPORTED_ABIS} instead.
			*/
			@Deprecated
	public static final String CPU_ABI2 = getString("ro.product.cpu.abi2");		public static final String CPU_ABI2 = getString("ro.product.cpu.abi2");

	/** The manufacturer of the product/hardware. */		/** The manufacturer of the product/hardware. */
	@@ -85,8 +95,6 @@ public class Build {
	* element in the list.		* element in the list.
	*		*
	* See {@link #SUPPORTED_32_BIT_ABIS} and {@link #SUPPORTED_64_BIT_ABIS}.		* See {@link #SUPPORTED_32_BIT_ABIS} and {@link #SUPPORTED_64_BIT_ABIS}.
	*
	* @hide
	*/		*/
	public static final String[] SUPPORTED_ABIS = SystemProperties.get("ro.product.cpu.abilist")		public static final String[] SUPPORTED_ABIS = SystemProperties.get("ro.product.cpu.abilist")
	.split(",");		.split(",");
	@@ -96,8 +104,6 @@ public class Build {
	* is the first element in the list.		* is the first element in the list.
	*		*
	* See {@link #SUPPORTED_ABIS} and {@link #SUPPORTED_64_BIT_ABIS}.		* See {@link #SUPPORTED_ABIS} and {@link #SUPPORTED_64_BIT_ABIS}.
	*
	* @hide
	*/		*/
	public static final String[] SUPPORTED_32_BIT_ABIS =		public static final String[] SUPPORTED_32_BIT_ABIS =
	SystemProperties.get("ro.product.cpu.abilist32").split(",");		SystemProperties.get("ro.product.cpu.abilist32").split(",");
	@@ -107,8 +113,6 @@ public class Build {
	* is the first element in the list.		* is the first element in the list.
	*		*
	* See {@link #SUPPORTED_ABIS} and {@link #SUPPORTED_32_BIT_ABIS}.		* See {@link #SUPPORTED_ABIS} and {@link #SUPPORTED_32_BIT_ABIS}.
	*
	* @hide
	*/		*/
	public static final String[] SUPPORTED_64_BIT_ABIS =		public static final String[] SUPPORTED_64_BIT_ABIS =
	SystemProperties.get("ro.product.cpu.abilist64").split(",");		SystemProperties.get("ro.product.cpu.abilist64").split(",");

Original line number	Original line	Diff line number	Diff line
	@@ -20891,8 +20891,8 @@ package android.os {
	field public static final java.lang.String BOARD;		field public static final java.lang.String BOARD;
	field public static final java.lang.String BOOTLOADER;		field public static final java.lang.String BOOTLOADER;
	field public static final java.lang.String BRAND;		field public static final java.lang.String BRAND;
	field public static final java.lang.String CPU_ABI;		field public static final deprecated java.lang.String CPU_ABI;
	field public static final java.lang.String CPU_ABI2;		field public static final deprecated java.lang.String CPU_ABI2;
	field public static final java.lang.String DEVICE;		field public static final java.lang.String DEVICE;
	field public static final java.lang.String DISPLAY;		field public static final java.lang.String DISPLAY;
	field public static final java.lang.String FINGERPRINT;		field public static final java.lang.String FINGERPRINT;
	@@ -20904,6 +20904,9 @@ package android.os {
	field public static final java.lang.String PRODUCT;		field public static final java.lang.String PRODUCT;
	field public static final deprecated 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 SERIAL;
			field public static final java.lang.String[] SUPPORTED_32_BIT_ABIS;
			field public static final java.lang.String[] SUPPORTED_64_BIT_ABIS;
			field public static final java.lang.String[] SUPPORTED_ABIS;
	field public static final java.lang.String TAGS;		field public static final java.lang.String TAGS;
	field public static final long TIME;		field public static final long TIME;
	field public static final java.lang.String TYPE;		field public static final java.lang.String TYPE;