diff options
| author | Michael Jurka <mikejurka@google.com> | 2012-06-18 10:33:21 -0700 |
|---|---|---|
| committer | Michael Jurka <mikejurka@google.com> | 2012-06-18 10:40:03 -0700 |
| commit | 5649c287039ea7908112b41604c3fc2893c4697e (patch) | |
| tree | 4967905cea142ea165177bdae454776c74b68298 /src/com/android/launcher2/InstallShortcutReceiver.java | |
| parent | a35a7807c27641187e6de5dee8dcd405b683e294 (diff) | |
| download | Launcher2-5649c287039ea7908112b41604c3fc2893c4697e.tar.gz | |
Add null pointer checks to fix NPEs
Bug: 6611233
Bug: 6685401
Change-Id: I804dfe0a7ad36b43168f7384ef88459d765fff6b
Diffstat (limited to 'src/com/android/launcher2/InstallShortcutReceiver.java')
| -rw-r--r-- | src/com/android/launcher2/InstallShortcutReceiver.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/launcher2/InstallShortcutReceiver.java b/src/com/android/launcher2/InstallShortcutReceiver.java index 54ba7de1..a525d00e 100644 --- a/src/com/android/launcher2/InstallShortcutReceiver.java +++ b/src/com/android/launcher2/InstallShortcutReceiver.java @@ -169,6 +169,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); |