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

am 9d6e87b6: am da687918: Make getInt in BridgeTypedArray accept empty String. [DO NOT MERGE]

Browse Source 
* commit '9d6e87b67eb0d39d7584b12a3e843db68c8c9f3b':
  Make getInt in BridgeTypedArray accept empty String. [DO NOT MERGE]
This commit is contained in:
Deepanshu Gupta
2015-08-26 20:22:29 +00:00
committed by Android Git Automerger
parent 728fc73130 9d6e87b67e
commit 5769732e6e
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/layoutlib/bridge/src/android/content/res/BridgeTypedArray.java
View File

@@ -239,15 +239,12 @@ public final class BridgeTypedArray extends TypedArray {
public int getInt(int index, int defValue) { public int getInt(int index, int defValue) {
String s = getString(index); String s = getString(index);
try { try {
if (s != null) { return convertValueToInt(s, defValue);
return convertValueToInt(s, defValue);
}
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
Bridge.getLog().warning(LayoutLog.TAG_RESOURCES_FORMAT, Bridge.getLog().warning(LayoutLog.TAG_RESOURCES_FORMAT,
String.format("\"%1$s\" in attribute \"%2$s\" is not a valid integer", String.format("\"%1$s\" in attribute \"%2$s\" is not a valid integer",
s, mNames[index]), s, mNames[index]),
null); null);
return defValue;
} }
return defValue; return defValue;
} }
@@ -948,7 +945,7 @@ public final class BridgeTypedArray extends TypedArray {
* "XXXXXXXX" > 80000000. * "XXXXXXXX" > 80000000.
*/ */
private static int convertValueToInt(@Nullable String charSeq, int defValue) { private static int convertValueToInt(@Nullable String charSeq, int defValue) {
if (null == charSeq) if (null == charSeq || charSeq.isEmpty())
return defValue; return defValue;
int sign = 1; int sign = 1;