2 files changed, 6 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/latin/Settings.java b/java/src/com/android/inputmethod/latin/Settings.java
index 08f3e8456..c9ff0a5a8 100644
--- a/java/src/com/android/inputmethod/latin/Settings.java
+++ b/java/src/com/android/inputmethod/latin/Settings.java
@@ -151,6 +151,11 @@ public class Settings extends InputMethodSettingsFragment
 
         if (!VibratorUtils.getInstance(context).hasVibrator()) {
             generalSettings.removePreference(findPreference(PREF_VIBRATE_ON));
+            final PreferenceGroup advancedSettings =
+                    (PreferenceGroup) findPreference(PREF_ADVANCED_SETTINGS);
+            if (null != advancedSettings) { // Theoretically advancedSettings cannot be null
+                advancedSettings.removePreference(findPreference(PREF_VIBRATION_DURATION_SETTINGS));
+            }
         }
 
         final boolean showPopupOption = res.getBoolean(
diff --git a/java/src/com/android/inputmethod/latin/TargetApplicationGetter.java b/java/src/com/android/inputmethod/latin/TargetApplicationGetter.java
index 4fb2e9704..4265309e5 100644
--- a/java/src/com/android/inputmethod/latin/TargetApplicationGetter.java
+++ b/java/src/com/android/inputmethod/latin/TargetApplicationGetter.java
@@ -29,6 +29,7 @@ public class TargetApplicationGetter extends AsyncTask<String, Void, Application
             new LruCache<String, ApplicationInfo>(MAX_CACHE_ENTRIES);
 
     public static ApplicationInfo getCachedApplicationInfo(final String packageName) {
+        if (null == packageName) return null;
         return sCache.get(packageName);
     }
     public static void removeApplicationInfoCache(final String packageName) {