commit ad4f583ecc7390846dfc19da692d6778a7f50b3c
author Jay Shrauner <shrauner@google.com> Fri Mar 21 20:04:51 2014 -0700
committer Jay Shrauner <shrauner@google.com> Thu Apr 17 14:56:04 2014 -0700
tree fcf49bc3cd27c9e594cb7446e00fde6e952e5c82
parent 232df2f3b2f34455928c0f163b56f12dd55132b3

Fix NPE when lack index counts

Fix NPE when index counts aren't present in bundle.

Bug:14140956
Change-Id: I491bce17be57b13e72e75a443de77550ed5e487e

src/com/android/contacts/common/list/ContactEntryListAdapter.java

diff --git a/src/com/android/contacts/common/list/ContactEntryListAdapter.java b/src/com/android/contacts/common/list/ContactEntryListAdapter.java
index 3c8a450..92048b8 100644
--- a/src/com/android/contacts/common/list/ContactEntryListAdapter.java
+++ b/src/com/android/contacts/common/list/ContactEntryListAdapter.java
@@ -455,7 +455,8 @@
         }
 
         Bundle bundle = cursor.getExtras();
-        if (bundle.containsKey(ContactCounts.EXTRA_ADDRESS_BOOK_INDEX_TITLES)) {
+        if (bundle.containsKey(ContactCounts.EXTRA_ADDRESS_BOOK_INDEX_TITLES) &&
+                bundle.containsKey(ContactCounts.EXTRA_ADDRESS_BOOK_INDEX_COUNTS)) {
             String sections[] =
                     bundle.getStringArray(ContactCounts.EXTRA_ADDRESS_BOOK_INDEX_TITLES);
             int counts[] = bundle.getIntArray(ContactCounts.EXTRA_ADDRESS_BOOK_INDEX_COUNTS);