From aa516beb79693ceffbd81a7c9d14c940e412cccb Mon Sep 17 00:00:00 2001
From: Romain Guy <romainguy@android.com>
Date: Fri, 5 Mar 2010 17:33:20 -0800
Subject: [PATCH] Correctly validate numbers when pasted in NumberPicker. Bug
 #2258525

---
 core/java/android/widget/NumberPicker.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/java/android/widget/NumberPicker.java b/core/java/android/widget/NumberPicker.java
index fd18db491b12f..582d9e4a104ac 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)) {