diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2015-08-26 05:58:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-26 05:58:21 +0000 |
| commit | 9d6e87b67eb0d39d7584b12a3e843db68c8c9f3b (patch) | |
| tree | ba3ec3eaf4105e1165977e3719b7c88e5c2f740a | |
| parent | c43506fc2dbe3fea6885e74ac8c67b91a0a644ff (diff) | |
| parent | da687918e13010d56e3d067e0ef477165cf38e10 (diff) | |
| download | frameworks_base-9d6e87b67eb0d39d7584b12a3e843db68c8c9f3b.zip frameworks_base-9d6e87b67eb0d39d7584b12a3e843db68c8c9f3b.tar.gz frameworks_base-9d6e87b67eb0d39d7584b12a3e843db68c8c9f3b.tar.bz2 | |
am da687918: Make getInt in BridgeTypedArray accept empty String. [DO NOT MERGE]
* commit 'da687918e13010d56e3d067e0ef477165cf38e10':
Make getInt in BridgeTypedArray accept empty String. [DO NOT MERGE]
| -rw-r--r-- | tools/layoutlib/bridge/src/android/content/res/BridgeTypedArray.java | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tools/layoutlib/bridge/src/android/content/res/BridgeTypedArray.java b/tools/layoutlib/bridge/src/android/content/res/BridgeTypedArray.java index d54e3d7..b8fd1ca 100644 --- a/tools/layoutlib/bridge/src/android/content/res/BridgeTypedArray.java +++ b/tools/layoutlib/bridge/src/android/content/res/BridgeTypedArray.java @@ -239,15 +239,12 @@ public final class BridgeTypedArray extends TypedArray { public int getInt(int index, int defValue) { String s = getString(index); try { - if (s != null) { - return convertValueToInt(s, defValue); - } + return convertValueToInt(s, defValue); } catch (NumberFormatException e) { Bridge.getLog().warning(LayoutLog.TAG_RESOURCES_FORMAT, String.format("\"%1$s\" in attribute \"%2$s\" is not a valid integer", s, mNames[index]), null); - return defValue; } return defValue; } @@ -948,7 +945,7 @@ public final class BridgeTypedArray extends TypedArray { * "XXXXXXXX" > 80000000. */ private static int convertValueToInt(@Nullable String charSeq, int defValue) { - if (null == charSeq) + if (null == charSeq || charSeq.isEmpty()) return defValue; int sign = 1; |