am 2561ee84: am d74389d9: Merge "Add null pointer checks to fix NPEs" into jb-dev

* commit '2561ee8453dc41a9d65f7890ea227416d7e8948c':
  Add null pointer checks to fix NPEs
This commit is contained in:
Michael Jurka
2012-06-18 14:43:06 -07:00
committed by Android Git Automerger
2 changed files with 4 additions and 1 deletions

View File

@@ -168,6 +168,7 @@ public class InstallShortcutReceiver extends BroadcastReceiver {
if (intent.getAction() == null) {
intent.setAction(Intent.ACTION_VIEW);
} else if (intent.getAction().equals(Intent.ACTION_MAIN) &&
intent.getCategories() != null &&
intent.getCategories().contains(Intent.CATEGORY_LAUNCHER)) {
intent.addFlags(
Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);