Merge 9fe469b3fe2f10871fff3b50cfb51ff3dbb4ed29 on remote branch

Change-Id: Ic9425acc35b0613478026932ce07acf1cc66c900

3 files changed, 15 insertions, 13 deletions

diff --git a/src/com/android/contacts/ContactSaveService.java b/src/com/android/contacts/ContactSaveService.java
index c00660f56..93a2b8dde 100755
--- a/src/com/android/contacts/ContactSaveService.java
+++ b/src/com/android/contacts/ContactSaveService.java
@@ -56,6 +56,8 @@ import com.android.contacts.activities.ContactEditorBaseActivity;
 import com.android.contacts.common.MoreContactUtils;
 import com.android.contacts.common.SimContactsConstants;
 import com.android.contacts.common.SimContactsOperation;
+import com.android.contacts.common.model.ValuesDelta;
+import com.android.contacts.common.model.account.ExchangeAccountType;
 import com.android.contacts.common.compat.CompatUtils;
 import com.android.contacts.common.database.ContactUpdateUtils;
 import com.android.contacts.common.model.AccountTypeManager;
@@ -469,7 +471,9 @@ public class ContactSaveService extends IntentService {
             final String accountType = entity.getValues().getAsString(RawContacts.ACCOUNT_TYPE);
             final String accountName = entity.getValues().getAsString(RawContacts.ACCOUNT_NAME);
             rawContactsList.add(entity.getRawContactId());
-
+            if (accountType != null
+                    && ExchangeAccountType.isExchangeType(accountType))
+                removeDisplayName(entity);
             final int subscription = MoreContactUtils.getSubscription(
                 accountType, accountName);
             isCardOperation = (subscription != SubscriptionManager.INVALID_SUBSCRIPTION_ID) ?
@@ -641,6 +645,14 @@ public class ContactSaveService extends IntentService {
         }
     }
 
+    private void removeDisplayName(RawContactDelta entity) {
+        ArrayList<ValuesDelta> names = entity
+                .getMimeEntries(StructuredName.CONTENT_ITEM_TYPE);
+        if (names != null
+                && names.get(0).containsKey(StructuredName.DISPLAY_NAME))
+            names.get(0).putNull(StructuredName.DISPLAY_NAME);
+    }
+
     private Integer doSaveToSimCard(RawContactDelta entity, ContentResolver resolver,
             int subscription) {
 
diff --git a/src/com/android/contacts/multipicker/GroupsFragment.java b/src/com/android/contacts/multipicker/GroupsFragment.java
index 1f38ca608..6cfe56c1a 100755
--- a/src/com/android/contacts/multipicker/GroupsFragment.java
+++ b/src/com/android/contacts/multipicker/GroupsFragment.java
@@ -237,7 +237,7 @@ public class GroupsFragment extends ExpandableListFragment implements OnGroupCli
         if (mAdapter.getCursor() != null) {
             mAdapter.getCursor().close();
         }
-
+        mAdapter.notifyDataSetInvalidated();
         if(allContactsInGroups!=null)
             allContactsInGroups.close();
 
@@ -790,8 +790,6 @@ public class GroupsFragment extends ExpandableListFragment implements OnGroupCli
         protected Cursor getChildrenCursor(Cursor groupCursor) {
             long groupId = groupCursor.getLong(GROUP_ID);
             Cursor c = getContactsDetailCursor(groupId);
-            if (c != null)
-                getActivity().startManagingCursor(c);
             return c;
         }
 
@@ -811,7 +809,7 @@ public class GroupsFragment extends ExpandableListFragment implements OnGroupCli
         private void fillAllContactsCursorMap() {
             mAllContactsCurosrMap.clear();
             Cursor cursor = null;
-            if (mGroupsCursor == null)
+            if (mGroupsCursor == null || mGroupsCursor.isClosed())
                 return;
             for (int groupPosition = 0; groupPosition < mGroupsCursor.getCount(); groupPosition++) {
                 mGroupsCursor.moveToPosition(groupPosition);
diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index 105d34944..656d10be3 100644..100755
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -3393,20 +3393,12 @@ public class QuickContactActivity extends ContactsActivity
                         StringBuilder strAnrNum = new StringBuilder();
                         for (int j = 1; j < arrayNumber.size(); j++) {
                             String s = arrayNumber.get(j);
-                            if (s.length() > MoreContactUtils.MAX_LENGTH_NUMBER_IN_SIM) {
-                                s = s.substring(
-                                        0, MoreContactUtils.MAX_LENGTH_NUMBER_IN_SIM);
-                            }
                             strAnrNum.append(s);
                             strAnrNum.append(SimContactsConstants.ANR_SEP);
                         }
                         StringBuilder strEmail = new StringBuilder();
                         for (int j = 0; j < arrayEmail.size(); j++) {
                             String s = arrayEmail.get(j);
-                            if (s.length() > MoreContactUtils.MAX_LENGTH_EMAIL_IN_SIM) {
-                                s = s.substring(
-                                        0, MoreContactUtils.MAX_LENGTH_EMAIL_IN_SIM);
-                            }
                             strEmail.append(s);
                             strEmail.append(SimContactsConstants.EMAIL_SEP);
                         }