commit 1cb10cd201aac827e03f0b985ef1737e3cbf802c
author Svetoslav Ganov <svetoslavganov@google.com> Fri Jul 29 17:51:53 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 29 17:51:53 2011 -0700
tree 1e77f071bb7248c8c2b5517e809fedca7c63c9f2
parent f263c705c16abc1be3ab0d20755c1f29e1c8ec2e
parent 6041c5ea97515e6bc483c579ee6920d531d93f06

Merge "Accessibility settings crash when run for the first time on clean device"

src/com/android/settings/AccessibilitySettings.java

diff --git a/src/com/android/settings/AccessibilitySettings.java b/src/com/android/settings/AccessibilitySettings.java
index a4b7975..cb56e63 100644
--- a/src/com/android/settings/AccessibilitySettings.java
+++ b/src/com/android/settings/AccessibilitySettings.java
@@ -489,7 +489,8 @@
         mSelectLongPressTimeoutPreference.setEnabled(accessibilityEnabled);
         final int longPressTimeout;
         if (accessibilityEnabled) {
-            longPressTimeout = Integer.parseInt(mSelectLongPressTimeoutPreference.getValue());
+            String value = mSelectLongPressTimeoutPreference.getValue();
+            longPressTimeout = (value != null) ? Integer.parseInt(value) : mLongPressTimeoutDefault;
         } else {
             longPressTimeout = mLongPressTimeoutDefault;
         }