summaryrefslogtreecommitdiffstats
path: root/core/java/android/widget/NumberPicker.java
diff options
context:
space:
mode:
authorRomain Guy <romainguy@android.com>2010-03-05 17:33:20 -0800
committerRomain Guy <romainguy@android.com>2010-03-05 17:33:20 -0800
commitaa516beb79693ceffbd81a7c9d14c940e412cccb (patch)
treeda4a56d54388e49190b40f4f9593b522be7e414b /core/java/android/widget/NumberPicker.java
parent9277c6d97214c96548cdcf4c822c88d5d331b2aa (diff)
downloadframeworks_base-aa516beb79693ceffbd81a7c9d14c940e412cccb.zip
frameworks_base-aa516beb79693ceffbd81a7c9d14c940e412cccb.tar.gz
frameworks_base-aa516beb79693ceffbd81a7c9d14c940e412cccb.tar.bz2
Correctly validate numbers when pasted in NumberPicker.
Bug #2258525
Diffstat (limited to 'core/java/android/widget/NumberPicker.java')
-rw-r--r--core/java/android/widget/NumberPicker.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/core/java/android/widget/NumberPicker.java b/core/java/android/widget/NumberPicker.java
index fd18db4..582d9e4 100644
--- a/core/java/android/widget/NumberPicker.java
+++ b/core/java/android/widget/NumberPicker.java
@@ -473,10 +473,13 @@ public class NumberPicker extends LinearLayout {
private int getSelectedPos(String str) {
if (mDisplayedValues == null) {
- return Integer.parseInt(str);
+ try {
+ return Integer.parseInt(str);
+ } catch (NumberFormatException e) {
+ /* Ignore as if it's not a number we don't care */
+ }
} else {
for (int i = 0; i < mDisplayedValues.length; i++) {
-
/* Don't force the user to type in jan when ja will do */
str = str.toLowerCase();
if (mDisplayedValues[i].toLowerCase().startsWith(str)) {