diff options
| author | Michael Jurka <mikejurka@google.com> | 2012-06-18 14:43:06 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-18 14:43:06 -0700 |
| commit | d23865708c4ca6d1d48eb8b1a3cb52d571e96f86 (patch) | |
| tree | 9cf1ca0385138d0a8d6af3c7dba8363f3cce77d4 | |
| parent | 11ef746c5b20dc5be271435e8d2807a8bc22738e (diff) | |
| parent | 2561ee8453dc41a9d65f7890ea227416d7e8948c (diff) | |
| download | android_packages_apps_Trebuchet-d23865708c4ca6d1d48eb8b1a3cb52d571e96f86.tar.gz android_packages_apps_Trebuchet-d23865708c4ca6d1d48eb8b1a3cb52d571e96f86.tar.bz2 android_packages_apps_Trebuchet-d23865708c4ca6d1d48eb8b1a3cb52d571e96f86.zip | |
am 2561ee84: am d74389d9: Merge "Add null pointer checks to fix NPEs" into jb-dev
* commit '2561ee8453dc41a9d65f7890ea227416d7e8948c':
Add null pointer checks to fix NPEs
| -rw-r--r-- | src/com/android/launcher2/Folder.java | 4 | ||||
| -rw-r--r-- | src/com/android/launcher2/InstallShortcutReceiver.java | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/launcher2/Folder.java b/src/com/android/launcher2/Folder.java index dfbe8d2c3..53c304609 100644 --- a/src/com/android/launcher2/Folder.java +++ b/src/com/android/launcher2/Folder.java @@ -923,7 +923,9 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList private void onCloseComplete() { DragLayer parent = (DragLayer) getParent(); - parent.removeView(this); + if (parent != null) { + parent.removeView(this); + } mDragController.removeDropTarget((DropTarget) this); clearFocus(); mFolderIcon.requestFocus(); diff --git a/src/com/android/launcher2/InstallShortcutReceiver.java b/src/com/android/launcher2/InstallShortcutReceiver.java index fb7bf30e0..20a19660e 100644 --- a/src/com/android/launcher2/InstallShortcutReceiver.java +++ b/src/com/android/launcher2/InstallShortcutReceiver.java @@ -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); |