Merge "Fix bug 5312352 - ListView modal multi-select mode bugs"

1 files changed, 3 insertions, 5 deletions

diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java
index 353d83c49672..5642b7b6b861 100644
--- a/core/java/android/widget/AbsListView.java
+++ b/core/java/android/widget/AbsListView.java
@@ -2576,13 +2576,11 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
             final int longPressPosition, final long longPressId) {
         // CHOICE_MODE_MULTIPLE_MODAL takes over long press.
         if (mChoiceMode == CHOICE_MODE_MULTIPLE_MODAL) {
-            if (mChoiceActionMode == null) {
-                mChoiceActionMode = startActionMode(mMultiChoiceModeCallback);
+            if (mChoiceActionMode == null &&
+                    (mChoiceActionMode = startActionMode(mMultiChoiceModeCallback)) != null) {
                 setItemChecked(longPressPosition, true);
+                performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
             }
-            // TODO Should we select the long pressed item if we were already in
-            // selection mode? (i.e. treat it like an item click?)
-            performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
             return true;
         }