commit dec34b5f3b674e9955202c7b1cb5ef00b628f37b
author Geoff Mendal <mendal@google.com> Mon Oct 06 20:48:49 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 06 20:48:50 2014 +0000
tree ae58a0b11552898f2cf79f87ee323d4d62d36063
parent b831b14466d640fe260ba2e752c88c7fcd62a14b
parent d699c7fd3b80d0203eaef4b982b6ddfa38890ea9

Merge "Import translations. DO NOT MERGE" into lmp-dev

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

diff --git a/src/com/android/contacts/list/ContactPickerFragment.java b/src/com/android/contacts/list/ContactPickerFragment.java
index 442f5c7..0503d33 100644
--- a/src/com/android/contacts/list/ContactPickerFragment.java
+++ b/src/com/android/contacts/list/ContactPickerFragment.java
@@ -128,6 +128,9 @@
         } else {
             uri = ((ContactListAdapter)getAdapter()).getContactUri(position);
         }
+        if (uri == null) {
+            return;
+        }
         if (mEditMode) {
             editContact(uri);
         } else  if (mShortcutRequested) {

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

diff --git a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
index bf1bdca..4630202 100644
--- a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
+++ b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
@@ -18,6 +18,7 @@
 import android.content.Context;
 import android.content.CursorLoader;
 import android.content.Intent;
+import android.net.Uri;
 import android.provider.ContactsContract.Contacts;
 import android.text.TextUtils;
 import android.util.Log;
@@ -86,7 +87,11 @@
 
     @Override
     protected void onItemClick(int position, long id) {
-        viewContact(getAdapter().getContactUri(position));
+        final Uri uri = getAdapter().getContactUri(position);
+        if (uri == null) {
+            return;
+        }
+        viewContact(uri);
     }
 
     @Override

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

diff --git a/src/com/android/contacts/list/EmailAddressPickerFragment.java b/src/com/android/contacts/list/EmailAddressPickerFragment.java
index 2146b68..f89f743 100644
--- a/src/com/android/contacts/list/EmailAddressPickerFragment.java
+++ b/src/com/android/contacts/list/EmailAddressPickerFragment.java
@@ -45,6 +45,9 @@
     @Override
     protected void onItemClick(int position, long id) {
         EmailAddressListAdapter adapter = (EmailAddressListAdapter)getAdapter();
+        if (getAdapter().getItem(position) == null) {
+            return;
+        }
         pickEmailAddress(adapter.getDataUri(position));
     }
 

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

diff --git a/src/com/android/contacts/list/PostalAddressPickerFragment.java b/src/com/android/contacts/list/PostalAddressPickerFragment.java
index a23a78b..c64e173 100644
--- a/src/com/android/contacts/list/PostalAddressPickerFragment.java
+++ b/src/com/android/contacts/list/PostalAddressPickerFragment.java
@@ -46,6 +46,9 @@
 
     @Override
     protected void onItemClick(int position, long id) {
+        if (getAdapter().getItem(position) == null) {
+            return;
+        }
         if (!isLegacyCompatibilityMode()) {
             PostalAddressListAdapter adapter = (PostalAddressListAdapter)getAdapter();
             pickPostalAddress(adapter.getDataUri(position));