diff options
| author | 2014-07-13 08:35:07 +0000 | |
|---|---|---|
| committer | 2014-07-10 20:16:40 +0000 | |
| commit | 1dcdbb5af50053613d01710123b45e2463350ac7 (patch) | |
| tree | 8deda4f669da41698e2e5be1ac1f83a8ccf73c63 | |
| parent | 906cf8e8a65027314ff71e0895b5e7e2263f1cbd (diff) | |
| parent | 1adf4002e7517c9981df0d1320e18b38a86978f8 (diff) | |
Merge "Unhide Build.SUPPORTED_ABIS and friends."
| -rw-r--r-- | api/current.txt | 7 | ||||
| -rw-r--r-- | core/java/android/os/Build.java | 20 |
2 files changed, 17 insertions, 10 deletions
diff --git a/api/current.txt b/api/current.txt index 5beee725c7d7..f5cc80c4473d 100644 --- a/api/current.txt +++ b/api/current.txt @@ -20891,8 +20891,8 @@ package android.os { field public static final java.lang.String BOARD; field public static final java.lang.String BOOTLOADER; field public static final java.lang.String BRAND; - field public static final java.lang.String CPU_ABI; - field public static final java.lang.String CPU_ABI2; + field public static final deprecated java.lang.String CPU_ABI; + 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 DISPLAY; 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 deprecated java.lang.String RADIO; 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 long TIME; field public static final java.lang.String TYPE; diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java index a7485b401a49..b5c4cd61a933 100644 --- a/core/java/android/os/Build.java +++ b/core/java/android/os/Build.java @@ -45,10 +45,20 @@ public class Build { /** The name of the underlying board, like "goldfish". */ 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"); - /** 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"); /** The manufacturer of the product/hardware. */ @@ -85,8 +95,6 @@ public class Build { * element in the list. * * 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") .split(","); @@ -96,8 +104,6 @@ public class Build { * is the first element in the list. * * See {@link #SUPPORTED_ABIS} and {@link #SUPPORTED_64_BIT_ABIS}. - * - * @hide */ public static final String[] SUPPORTED_32_BIT_ABIS = SystemProperties.get("ro.product.cpu.abilist32").split(","); @@ -107,8 +113,6 @@ public class Build { * is the first element in the list. * * See {@link #SUPPORTED_ABIS} and {@link #SUPPORTED_32_BIT_ABIS}. - * - * @hide */ public static final String[] SUPPORTED_64_BIT_ABIS = SystemProperties.get("ro.product.cpu.abilist64").split(","); |