commit 097b10bbd1a2bc110556ec928db4568493a5d21e
author Daniel Lehmann <lehmannd@google.com> Tue Apr 24 17:04:40 2012 -0700
committer Daniel Lehmann <lehmannd@google.com> Tue Apr 24 17:04:40 2012 -0700
tree 7d05e8ab390eb228f3833c2fa713549f4d3d516a
parent 9b22fe199ca0c352d0c10adf2a1b956e419eeef5

Guard against a Monkey NPE

Bug:5628769
Change-Id: I68f32088ce7cecf30e0f68e888f9af2e71b2eec4

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

diff --git a/src/com/android/contacts/list/JoinContactListFragment.java b/src/com/android/contacts/list/JoinContactListFragment.java
index 7c6767b..f8fc4cd 100644
--- a/src/com/android/contacts/list/JoinContactListFragment.java
+++ b/src/com/android/contacts/list/JoinContactListFragment.java
@@ -24,6 +24,7 @@
 import android.content.Intent;
 import android.content.Loader;
 import android.database.Cursor;
+import android.net.Uri;
 import android.os.Bundle;
 import android.provider.ContactsContract.Contacts;
 import android.text.TextUtils;
@@ -148,14 +149,14 @@
 
     @Override
     protected void onItemClick(int position, long id) {
-        JoinContactListAdapter adapter = getAdapter();
-        int partition = adapter.getPartitionForPosition(position);
-        mListener.onPickContactAction(adapter.getContactUri(position));
+        final Uri contactUri = getAdapter().getContactUri(position);
+        if (contactUri != null) mListener.onPickContactAction(contactUri);
     }
 
     @Override
     public void onPickerResult(Intent data) {
-        mListener.onPickContactAction(data.getData());
+        final Uri contactUri = data.getData();
+        if (contactUri != null) mListener.onPickContactAction(contactUri);
     }
 
     @Override