commit ed71e4ebb532856e55d67e17e2aadcaa526800aa
author Dmitri Plotnikov <dplotnikov@google.com> Tue Mar 16 15:22:23 2010 -0700
committer Dmitri Plotnikov <dplotnikov@google.com> Tue Mar 16 15:22:23 2010 -0700
tree d3bf62a7abc016ebf503b0611e7a29cca0ddf810
parent 6985dd8f96bc086be68498ace6ea848408bdee1a

Fixing NPE in "pick or create new contact"

Bug: 2513826
Change-Id: I258da57feef78e3f30ee8372dba6caed81adc76d

src/com/android/contacts/ContactsListActivity.java

diff --git a/src/com/android/contacts/ContactsListActivity.java b/src/com/android/contacts/ContactsListActivity.java
index 28c5502..06a24e5 100644
--- a/src/com/android/contacts/ContactsListActivity.java
+++ b/src/com/android/contacts/ContactsListActivity.java
@@ -3481,7 +3481,11 @@
             } else if (isSearchAllContactsItemPosition(pos)){
                 return null;
             } else {
-                return super.getItem(getRealPosition(pos));
+                int realPosition = getRealPosition(pos);
+                if (realPosition < 0) {
+                    return null;
+                }
+                return super.getItem(realPosition);
             }
         }
 
@@ -3496,7 +3500,11 @@
             } else if (isSearchAllContactsItemPosition(pos)) {
                 return 0;
             }
-            return super.getItemId(getRealPosition(pos));
+            int realPosition = getRealPosition(pos);
+            if (realPosition < 0) {
+                return 0;
+            }
+            return super.getItemId(realPosition);
         }
 
         public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount,