From 37b8567a87b42e0429203a6c1ebda187ff1757ae Mon Sep 17 00:00:00 2001
From: Sumir Kataria <sumir@google.com>
Date: Tue, 11 Jul 2017 15:35:30 -0700
Subject: clearChoices when setting AbsListView adapters.

This allows us to reset mCheckedItemCount to 0 to match the clearing
of check states.

Bug: 63559021
Fixes: 63559021
Test: Added test to AbsListViewTest.

Change-Id: I47a0fbc25448addf75a3f7e5a282bb98360200dd
---
 core/java/android/widget/AbsListView.java | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java
index 5476ab216f2f..91e2f7d4ddd0 100644
--- a/core/java/android/widget/AbsListView.java
+++ b/core/java/android/widget/AbsListView.java
@@ -913,14 +913,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
                 mCheckedIdStates = new LongSparseArray<Integer>();
             }
         }
-
-        if (mCheckStates != null) {
-            mCheckStates.clear();
-        }
-
-        if (mCheckedIdStates != null) {
-            mCheckedIdStates.clear();
-        }
+        clearChoices();
     }
 
     /**
-- 
cgit v1.2.3-59-g8ed1b