Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid supported ABI list containing "unknown".

Browse Source 
If one of the ABI list system properties is undefined/empty (as
ro.product.cpu.abilist64 is on a 32-bit only device), getString returns
"unknown", which ends up creating a 1-element array with "unknown" as a
member. Fix this to instead just get the empty string and split that
into a 0-element array.

Change-Id: I0d0a54eb06bb04427bcf0487e2a16d4180b81116
This commit is contained in:
Torne (Richard Coles)
2014-05-14 16:17:26 +01:00
parent b7d7cbc9c3
commit da8c037c8b
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/os/Build.java
View File

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