commit 682440b224eaaa508ba7760ade4de9bf2d1ff528
author Michael Jurka <mikejurka@google.com> Tue May 08 15:01:30 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue May 08 15:01:30 2012 -0700
tree 85273d4780bd1dfd5353fbdc8af310541513f1d2
parent e1aca55ccc01a0064a9054c1cba03648158e26c0
parent c60498a91d82ca7d73402d5a5dd8467cd7e0391c

am c60498a9: Fix NPE

* commit 'c60498a91d82ca7d73402d5a5dd8467cd7e0391c':
  Fix NPE

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;
         }
     }