commit 2b54366e6334b6da48d229d3e5fbe191a8a4b54f
author Jay Shrauner <shrauner@google.com> Mon Dec 01 06:23:52 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Dec 01 06:23:54 2014 +0000
tree 202a4d8b64fbfe9f6aed748d25cedb97e789d743
parent 4d81ebbb6c519a4357bf55ce5d391d655616ca9c
parent 49de62f06d24653484adebd69123eeff2850a757

Merge "Fix NPE in shareContact" into lmp-mr1-dev

src/com/android/contacts/ContactSaveService.java

diff --git a/src/com/android/contacts/ContactSaveService.java b/src/com/android/contacts/ContactSaveService.java
index bdd2dd0..02a2471 100644
--- a/src/com/android/contacts/ContactSaveService.java
+++ b/src/com/android/contacts/ContactSaveService.java
@@ -514,6 +514,9 @@
     private long getInsertedRawContactId(
             final ArrayList<ContentProviderOperation> diff,
             final ContentProviderResult[] results) {
+        if (results == null) {
+            return -1;
+        }
         final int diffSize = diff.size();
         final int numResults = results.length;
         for (int i = 0; i < diffSize && i < numResults; i++) {

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 3e42fdf..89b02da 100644
--- a/src/com/android/contacts/list/JoinContactListFragment.java
+++ b/src/com/android/contacts/list/JoinContactListFragment.java
@@ -129,7 +129,9 @@
     private void showTargetContactName(String displayName) {
         Activity activity = getActivity();
         TextView blurbView = (TextView) activity.findViewById(R.id.join_contact_blurb);
-        String blurb = activity.getString(R.string.blurbJoinContactDataWith, displayName);
+        final String name = !TextUtils.isEmpty(displayName) ? displayName
+            : activity.getString(R.string.missing_name);
+        String blurb = activity.getString(R.string.blurbJoinContactDataWith, name);
         blurbView.setText(blurb);
     }