commit 969d578567c6929f36a72ef979ffa41ab9236787
author Dmitri Plotnikov <dplotnikov@google.com> Wed Jun 02 18:25:40 2010 -0700
committer Dmitri Plotnikov <dplotnikov@google.com> Wed Jun 02 18:25:40 2010 -0700
tree a62d3be65dd2064e34a80f705b1a9a7c4c470b26
parent 50bfc2a4f7ca8cdd54a18f97e055eb5f9bace9c0

Fixing NPE in Strequent contacts

Change-Id: Ie01164e6b8b84544c59028471ed7559ce4012dbf

src/com/android/contacts/list/StrequentContactListAdapter.java

diff --git a/src/com/android/contacts/list/StrequentContactListAdapter.java b/src/com/android/contacts/list/StrequentContactListAdapter.java
index c6ad061..757e3e7 100644
--- a/src/com/android/contacts/list/StrequentContactListAdapter.java
+++ b/src/com/android/contacts/list/StrequentContactListAdapter.java
@@ -149,11 +149,14 @@
 
     @Override
     public int getItemViewType(int position) {
-        if (position == mFrequentSeparatorPos) {
+        if (mFrequentSeparatorPos == ListView.INVALID_POSITION
+                || position < mFrequentSeparatorPos) {
+            return super.getItemViewType(position);
+        } else if (position == mFrequentSeparatorPos) {
             return IGNORE_ITEM_VIEW_TYPE;
+        } else {
+            return super.getItemViewType(position - 1);
         }
-
-        return super.getItemViewType(position);
     }
 
     @Override