summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/VoiceInputOutputSettings.java
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2012-09-23 12:54:14 -0700
committerAmith Yamasani <yamasani@google.com>2012-09-23 18:43:31 -0700
commit9627a8ea151c1f27e5e9f34592c7b34fea3101c3 (patch)
tree3c92cd339e0df9ae47ac4ab92964d9b5aab36c10 /src/com/android/settings/VoiceInputOutputSettings.java
parentb105531116148d5d29e113e611ac180aa9691c6e (diff)
downloadpackages_apps_Settings-9627a8ea151c1f27e5e9f34592c7b34fea3101c3.tar.gz
packages_apps_Settings-9627a8ea151c1f27e5e9f34592c7b34fea3101c3.tar.bz2
packages_apps_Settings-9627a8ea151c1f27e5e9f34592c7b34fea3101c3.zip
Show more settings and add restrictions/dialogs for secondary users
Bug: 7213029 crash in About>Status Bug: 7212495 hide System updates for second user Bug: 7212230 nickname editor should select the text Bug: 7160487 TTS settings Bug: 7129411 Settings needs visibility changes for secondary users Change-Id: Ia2d1229c08b392edfa6b671fce4a382410405b14
Diffstat (limited to 'src/com/android/settings/VoiceInputOutputSettings.java')
-rw-r--r--src/com/android/settings/VoiceInputOutputSettings.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/settings/VoiceInputOutputSettings.java b/src/com/android/settings/VoiceInputOutputSettings.java
index 81e624f57..b499deda1 100644
--- a/src/com/android/settings/VoiceInputOutputSettings.java
+++ b/src/com/android/settings/VoiceInputOutputSettings.java
@@ -183,6 +183,8 @@ public class VoiceInputOutputSettings implements OnPreferenceChangeListener {
private void updateSettingsLink(String currentSetting) {
ResolveInfo currentRecognizer = mAvailableRecognizersMap.get(currentSetting);
+ if (currentRecognizer == null) return;
+
ServiceInfo si = currentRecognizer.serviceInfo;
XmlResourceParser parser = null;
String settingsActivity = null;