commit c60498a91d82ca7d73402d5a5dd8467cd7e0391c
author Michael Jurka <mikejurka@google.com> Mon May 07 15:29:42 2012 -0700
committer Michael Jurka <mikejurka@google.com> Mon May 07 15:30:18 2012 -0700
tree 945f3c34d8cd21dddb83fa34f276ae0bef9fe0fc
parent 2a06b43ac56557e62a357b9b0928059a67c63c56

Fix NPE

Bug: 6424377

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 8b6fee9..5018806 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -2831,7 +2831,9 @@
             if (voiceButtonContainer != null) voiceButtonContainer.setVisibility(View.GONE);
             searchButton.setVisibility(View.GONE);
             voiceButton.setVisibility(View.GONE);
-            voiceButtonProxy.setVisibility(View.GONE);
+            if (voiceButtonProxy != null) {
+                voiceButtonProxy.setVisibility(View.GONE);
+            }
             return false;
         }
     }