diff options
author | Kunal Malhotra <malhk@google.com> | 2023-04-07 17:53:52 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-07 17:53:52 +0000 |
commit | b6e61db922bd7e71cd86498334770515460db31f (patch) | |
tree | 4dcb74582c4c8a49d3b33344af9094f82441a531 | |
parent | afaac625b6b91aba601c4eb3a286396845fa1632 (diff) | |
parent | e374a4bed8cf34d349a835a3531725d7196fd656 (diff) | |
download | ContactsProvider-b6e61db922bd7e71cd86498334770515460db31f.tar.gz |
Revert "Adding a fix for trimming any large fields before they are inserted into" am: e374a4bed8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/22428826
Change-Id: I4155170c900206800dc6620e462dad768041d957
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | src/com/android/providers/contacts/DataRowHandlerForNickname.java | 6 | ||||
-rw-r--r-- | src/com/android/providers/contacts/DataRowHandlerForOrganization.java | 8 |
2 files changed, 0 insertions, 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; } |