From 66d879ce9ffe4411184d54795f8adf5e7fe8cfec Mon Sep 17 00:00:00 2001
From: Lifu Tang <lifu@google.com>
Date: Wed, 25 Sep 2013 16:50:46 -0700
Subject: [PATCH] Don't show help menu when browser unavailable

- Fix b/10860551

Change-Id: I71d073ef96d406f1705672d7ccf75337e5250ec6
---
 src/com/android/settings/HelpUtils.java | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/com/android/settings/HelpUtils.java b/src/com/android/settings/HelpUtils.java
index 6cd5eb65c8e..a0f7e586958 100644
--- a/src/com/android/settings/HelpUtils.java
+++ b/src/com/android/settings/HelpUtils.java
@@ -16,6 +16,7 @@
 
 package com.android.settings;
 
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
@@ -95,9 +96,15 @@ public class HelpUtils {
 
             // Set the intent to the help menu item, show the help menu item in the overflow
             // menu, and make it visible.
-            helpMenuItem.setIntent(intent);
-            helpMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
-            helpMenuItem.setVisible(true);
+            ComponentName component = intent.resolveActivity(context.getPackageManager());
+            if (component != null) {
+                helpMenuItem.setIntent(intent);
+                helpMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
+                helpMenuItem.setVisible(true);
+            } else {
+                helpMenuItem.setVisible(false);
+                return false;
+            }
 
             // return that the help menu item is visible (i.e., true)
             return true;