summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2012-05-07 15:29:42 -0700
committerMichael Jurka <mikejurka@google.com>2012-05-07 15:30:18 -0700
commitc60498a91d82ca7d73402d5a5dd8467cd7e0391c (patch)
tree945f3c34d8cd21dddb83fa34f276ae0bef9fe0fc /src
parent2a06b43ac56557e62a357b9b0928059a67c63c56 (diff)
downloadandroid_packages_apps_Trebuchet-c60498a91d82ca7d73402d5a5dd8467cd7e0391c.tar.gz
android_packages_apps_Trebuchet-c60498a91d82ca7d73402d5a5dd8467cd7e0391c.tar.bz2
android_packages_apps_Trebuchet-c60498a91d82ca7d73402d5a5dd8467cd7e0391c.zip
Fix NPE
Bug: 6424377
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher2/Launcher.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 8b6fee92d..50188068b 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;
}
}