commit 7e1690ae43dc2cf310031e75a78b6d372adb7c0c
author android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> Thu Sep 24 12:12:47 2009 -0700
committer android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> Thu Sep 24 12:12:47 2009 -0700
tree 9d1b70c14c93f8ed43765c1e3eb4d9562d4aa38d
parent f493b768816f245ccf593953a743996e1a54055a

Revert "clear PHOTO column instead of deleting the row for focus"

This reverts commit a3c1b8beda9a79727690889647fdb9f234c760eb, as per Fred.

src/com/android/contacts/model/EntityModifier.java

diff --git a/src/com/android/contacts/model/EntityModifier.java b/src/com/android/contacts/model/EntityModifier.java
index 1d78cfc..0d8ede9 100644
--- a/src/com/android/contacts/model/EntityModifier.java
+++ b/src/com/android/contacts/model/EntityModifier.java
@@ -33,11 +33,9 @@
 import android.provider.ContactsContract.CommonDataKinds.Email;
 import android.provider.ContactsContract.CommonDataKinds.Im;
 import android.provider.ContactsContract.CommonDataKinds.Phone;
-import android.provider.ContactsContract.CommonDataKinds.Photo;
 import android.provider.ContactsContract.CommonDataKinds.StructuredName;
 import android.provider.ContactsContract.CommonDataKinds.StructuredPostal;
 import android.provider.ContactsContract.Intents.Insert;
-import android.provider.ContactsContract;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.SparseIntArray;
@@ -380,12 +378,8 @@
                     continue;
                 }
 
-                // Test and remove this row if empty and it isn't a photo from google
-                final boolean isGoogleSource = TextUtils.equals(GoogleSource.ACCOUNT_TYPE,
-                        entry.getAsString(RawContacts.ACCOUNT_TYPE));
-                final boolean isPhoto = TextUtils.equals(Photo.CONTENT_ITEM_TYPE, kind.mimeType);
-                final boolean isGooglePhoto = isPhoto && isGoogleSource;
-                if (EntityModifier.isEmpty(entry, kind) && !isGooglePhoto) {
+                // Test and remove this row if empty
+                if (EntityModifier.isEmpty(entry, kind)) {
                     // TODO: remove this verbose logging
                     Log.w(TAG, "Trimming: " + entry.toString());
                     entry.markDeleted();