From c60498a91d82ca7d73402d5a5dd8467cd7e0391c Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Mon, 7 May 2012 15:29:42 -0700
Subject: [PATCH] Fix NPE

Bug: 6424377
---
 src/com/android/launcher2/Launcher.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 8b6fee92df..50188068be 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -2831,7 +2831,9 @@ public final class Launcher extends Activity
             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;
         }
     }