am 83f6b130: Merge change 5237 into donut

Merge commit '83f6b130181982eb653621c2c4028feae36f1ffb'

* commit '83f6b130181982eb653621c2c4028feae36f1ffb':
  Calling setItemChecked(p, true) twice would toggle the selection in ListView.

1 files changed, 6 insertions, 2 deletions

diff --git a/core/java/android/widget/ListView.java b/core/java/android/widget/ListView.java
index 6532125d2b0a..f8a6f89a9880 100644
--- a/core/java/android/widget/ListView.java
+++ b/core/java/android/widget/ListView.java
@@ -3264,9 +3264,13 @@ public class ListView extends AbsListView {
         if (mChoiceMode == CHOICE_MODE_MULTIPLE) {
             mCheckStates.put(position, value);
         } else {
-            boolean oldValue = mCheckStates.get(position, false);
+            // Clear the old value: if something was selected and value == false
+            // then it is unselected
             mCheckStates.clear();
-            if (!oldValue) {
+            // If value == true, select the appropriate position
+            // this may end up selecting the value we just cleared but this way
+            // we don't have to first to a get(position)
+            if (value) {
                 mCheckStates.put(position, true);
             }
         }