diff options
author | Torne (Richard Coles) <torne@google.com> | 2014-05-14 15:26:04 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-14 15:26:05 +0000 |
commit | 41ec8c9672fccce90a7156bcd856f59a36e93ad3 (patch) | |
tree | a0a9e6f472106fd54ade8df6645d321b831c162d | |
parent | b7d7cbc9c3a9315a5c5ecd85e16f5916c4bc3f3a (diff) | |
parent | da8c037c8b3b36d2edc42595cbf3a18d345c1489 (diff) | |
download | base-41ec8c9672fccce90a7156bcd856f59a36e93ad3.tar.gz |
Merge "Avoid supported ABI list containing "unknown"."
-rw-r--r-- | core/java/android/os/Build.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java index 1bddc7ade314..a61c4f350cf0 100644 --- a/core/java/android/os/Build.java +++ b/core/java/android/os/Build.java @@ -83,7 +83,8 @@ public class Build { * * @hide */ - public static final String[] SUPPORTED_ABIS = getString("ro.product.cpu.abilist").split(","); + public static final String[] SUPPORTED_ABIS = SystemProperties.get("ro.product.cpu.abilist") + .split(","); /** * An ordered list of <b>32 bit</b> ABIs supported by this device. The most preferred ABI @@ -93,8 +94,8 @@ public class Build { * * @hide */ - public static final String[] SUPPORTED_32_BIT_ABIS = getString("ro.product.cpu.abilist32") - .split(","); + public static final String[] SUPPORTED_32_BIT_ABIS = + SystemProperties.get("ro.product.cpu.abilist32").split(","); /** * An ordered list of <b>64 bit</b> ABIs supported by this device. The most preferred ABI @@ -104,8 +105,8 @@ public class Build { * * @hide */ - public static final String[] SUPPORTED_64_BIT_ABIS = getString("ro.product.cpu.abilist64") - .split(","); + public static final String[] SUPPORTED_64_BIT_ABIS = + SystemProperties.get("ro.product.cpu.abilist64").split(","); /** Various version strings. */ |