From cb3af42d295d0b9ddd5353cf60d1f6765f08d086 Mon Sep 17 00:00:00 2001 From: Kunal Malhotra Date: Mon, 3 Apr 2023 14:42:54 +0000 Subject: Revert "Adding a fix for trimming any large fields before they are inserted into" This reverts commit ddb6cba69fc41836fda8173dbe259ff6f7e33790. Reason for revert: Shouldn't be backported Change-Id: I6e0d113841a4140c541905b4589bc94d6f0db896 --- src/com/android/providers/contacts/DataRowHandlerForNickname.java | 6 ------ .../android/providers/contacts/DataRowHandlerForOrganization.java | 8 -------- 2 files changed, 14 deletions(-) diff --git a/src/com/android/providers/contacts/DataRowHandlerForNickname.java b/src/com/android/providers/contacts/DataRowHandlerForNickname.java index 2806cf34..03b96a3a 100644 --- a/src/com/android/providers/contacts/DataRowHandlerForNickname.java +++ b/src/com/android/providers/contacts/DataRowHandlerForNickname.java @@ -35,14 +35,9 @@ public class DataRowHandlerForNickname extends DataRowHandlerForCommonDataKind { Nickname.LABEL); } - private void applySimpleFieldMaxSize(ContentValues cv) { - applySimpleFieldMaxSize(cv, Nickname.NAME); - } - @Override public long insert(SQLiteDatabase db, TransactionContext txContext, long rawContactId, ContentValues values) { - applySimpleFieldMaxSize(values); String nickname = values.getAsString(Nickname.NAME); long dataId = super.insert(db, txContext, rawContactId, values); @@ -58,7 +53,6 @@ public class DataRowHandlerForNickname extends DataRowHandlerForCommonDataKind { @Override public boolean update(SQLiteDatabase db, TransactionContext txContext, ContentValues values, Cursor c, boolean callerIsSyncAdapter) { - applySimpleFieldMaxSize(values); long dataId = c.getLong(DataUpdateQuery._ID); long rawContactId = c.getLong(DataUpdateQuery.RAW_CONTACT_ID); diff --git a/src/com/android/providers/contacts/DataRowHandlerForOrganization.java b/src/com/android/providers/contacts/DataRowHandlerForOrganization.java index 74f22595..66a3b1bd 100644 --- a/src/com/android/providers/contacts/DataRowHandlerForOrganization.java +++ b/src/com/android/providers/contacts/DataRowHandlerForOrganization.java @@ -22,7 +22,6 @@ import android.database.DatabaseUtils; import android.database.sqlite.SQLiteDatabase; import android.provider.ContactsContract.CommonDataKinds.Organization; import android.provider.ContactsContract.Data; - import com.android.providers.contacts.ContactsDatabaseHelper.Tables; import com.android.providers.contacts.SearchIndexManager.IndexBuilder; import com.android.providers.contacts.aggregation.AbstractContactAggregator; @@ -38,15 +37,9 @@ public class DataRowHandlerForOrganization extends DataRowHandlerForCommonDataKi Organization.CONTENT_ITEM_TYPE, Organization.TYPE, Organization.LABEL); } - private void applySimpleFieldMaxSize(ContentValues cv) { - applySimpleFieldMaxSize(cv, Organization.COMPANY); - applySimpleFieldMaxSize(cv, Organization.TITLE); - } - @Override public long insert(SQLiteDatabase db, TransactionContext txContext, long rawContactId, ContentValues values) { - applySimpleFieldMaxSize(values); String company = values.getAsString(Organization.COMPANY); String title = values.getAsString(Organization.TITLE); @@ -59,7 +52,6 @@ public class DataRowHandlerForOrganization extends DataRowHandlerForCommonDataKi @Override public boolean update(SQLiteDatabase db, TransactionContext txContext, ContentValues values, Cursor c, boolean callerIsSyncAdapter) { - applySimpleFieldMaxSize(values); if (!super.update(db, txContext, values, c, callerIsSyncAdapter)) { return false; } -- cgit v1.2.3