commit 9627a8ea151c1f27e5e9f34592c7b34fea3101c3
author Amith Yamasani <yamasani@google.com> Sun Sep 23 12:54:14 2012 -0700
committer Amith Yamasani <yamasani@google.com> Sun Sep 23 18:43:31 2012 -0700
tree 3c92cd339e0df9ae47ac4ab92964d9b5aab36c10
parent b105531116148d5d29e113e611ac180aa9691c6e

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

src/com/android/settings/VoiceInputOutputSettings.java

diff --git a/src/com/android/settings/VoiceInputOutputSettings.java b/src/com/android/settings/VoiceInputOutputSettings.java
index 81e624f..b499deda 100644
--- a/src/com/android/settings/VoiceInputOutputSettings.java
+++ b/src/com/android/settings/VoiceInputOutputSettings.java
@@ -183,6 +183,8 @@
     
     private void updateSettingsLink(String currentSetting) {
         ResolveInfo currentRecognizer = mAvailableRecognizersMap.get(currentSetting);
+        if (currentRecognizer == null) return;
+
         ServiceInfo si = currentRecognizer.serviceInfo;
         XmlResourceParser parser = null;
         String settingsActivity = null;