commit f8c8ac348cf217766a6626a5b7191a0de11f06d3
author Walter Jang <wjang@google.com> Sat Feb 20 02:07:15 2016 +0000
committer Walter Jang <wjang@google.com> Fri Feb 19 18:13:10 2016 -0800
tree 7d0559b52aec1acea0bdd8a66d56e2da15df51e1
parent b320c749d0f020cf4c90713f5d3ebc56dff10f1f

Revert "Don't pass read-only portions of RawContactDeltaList to contact save service"

This reverts commit e5bac73a8b241a43143e5780c07597cd6fa9230f.

Revert "Don't prune read only contacts in SaveService for joins and splits"

This reverts commit I717717a3c8b55315dcf3dde026af4c267f62e709.

Bug 27108237
Bug 27250533
Bug 23896510

Change-Id: If52f514c01f0d346fddc4083c710b7147761dd7d

src/com/android/contacts/ContactSaveService.java

diff --git a/src/com/android/contacts/ContactSaveService.java b/src/com/android/contacts/ContactSaveService.java
index 517305a..5c9c899 100755
--- a/src/com/android/contacts/ContactSaveService.java
+++ b/src/com/android/contacts/ContactSaveService.java
@@ -56,7 +56,6 @@
 import com.android.contacts.common.model.RawContactDelta;
 import com.android.contacts.common.model.RawContactDeltaList;
 import com.android.contacts.common.model.RawContactModifier;
-import com.android.contacts.common.model.account.AccountType;
 import com.android.contacts.common.model.account.AccountWithDataSet;
 import com.android.contacts.common.util.PermissionsUtil;
 import com.android.contacts.compat.PinnedPositionsCompat;
@@ -68,7 +67,6 @@
 
 import java.util.ArrayList;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
@@ -375,16 +373,8 @@
             String saveModeExtraKey, int saveMode, boolean isProfile,
             Class<? extends Activity> callbackActivity, String callbackAction,
             Bundle updatedPhotos, String joinContactIdExtraKey, Long joinContactId) {
-
-        // Don't pass read-only RawContactDeltas in RawContactDeltaList to contact save service,
-        // because 1. read-only RawContactDeltas are not writable anyway; 2. read-only
-        // RawContactDeltas may be problematic, see b/23896510.
-        // Except when we must create aggregation exceptions between the raw contacts
-        if (!(saveMode == SaveMode.JOIN || saveMode == SaveMode.SPLIT)) {
-            removeReadOnlyContacts(context, state);
-        }
-
-        Intent serviceIntent = new Intent(context, ContactSaveService.class);
+        Intent serviceIntent = new Intent(
+                context, ContactSaveService.class);
         serviceIntent.setAction(ContactSaveService.ACTION_SAVE_CONTACT);
         serviceIntent.putExtra(EXTRA_CONTACT_STATE, (Parcelable) state);
         serviceIntent.putExtra(EXTRA_SAVE_IS_PROFILE, isProfile);
@@ -409,26 +399,6 @@
         return serviceIntent;
     }
 
-    private static void removeReadOnlyContacts(Context context, RawContactDeltaList state) {
-        if (Log.isLoggable(TAG, Log.VERBOSE)) {
-            Log.v(TAG, "Before trimming: " + state.size());
-        }
-        int countReadOnly = 0;
-        final Iterator<RawContactDelta> iterator = state.iterator();
-        while (iterator.hasNext()) {
-            final RawContactDelta rawContactDelta = iterator.next();
-            final AccountType accountType = rawContactDelta.getRawContactAccountType(context);
-            if (accountType != null && !accountType.areContactsWritable()) {
-                countReadOnly++;
-                iterator.remove();
-            }
-        }
-        if (Log.isLoggable(TAG, Log.VERBOSE)) {
-            Log.v(TAG, "# of read-only removed: " + countReadOnly);
-            Log.v(TAG, "After trimming: " + state.size());
-        }
-    }
-
     private void saveContact(Intent intent) {
         RawContactDeltaList state = intent.getParcelableExtra(EXTRA_CONTACT_STATE);
         boolean isProfile = intent.getBooleanExtra(EXTRA_SAVE_IS_PROFILE, false);