summaryrefslogtreecommitdiffstats
path: root/core/java/android/view
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2015-06-02 16:47:52 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-02 16:47:53 +0000
commit5431000830551959db15038da8f057c2e993d01a (patch)
treeac68514dd48688ef50e5e9ea1515de49d399ea4d /core/java/android/view
parent233241f13d5d7f841d3db80408429d4d0a528c78 (diff)
parent069767717a8323bbb05988137a91d40968af2972 (diff)
downloadframeworks_base-5431000830551959db15038da8f057c2e993d01a.zip
frameworks_base-5431000830551959db15038da8f057c2e993d01a.tar.gz
frameworks_base-5431000830551959db15038da8f057c2e993d01a.tar.bz2
Merge "Remove strict mode violation from value to string coercion" into mnc-dev
Diffstat (limited to 'core/java/android/view')
-rw-r--r--core/java/android/view/View.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 3e621b1..3b1587a 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -4510,7 +4510,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
}
attributes[i] = resourceName;
- attributes[i + 1] = t.getString(index, false);
+ attributes[i + 1] = t.getString(index);
i += 2;
}