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;