aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-04-08Snap for 9905614 from 1ed769fc4d9ac90b4ffe761f9cb63287c87d44a3 to ↵android-13.0.0_r83android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r56android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseAndroid Build Coastguard Worker
tm-qpr3-release Change-Id: I5e47548f11ec26c59e4d35a55220083674af0846
2023-04-07[automerger skipped] Revert "Adding a fix for trimming any large fields ↵android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseKunal Malhotra
before they are inserted into" am: e374a4bed8 am: 423ccc879b -s ours am skip reason: Merged-In I52814fee6c5e137809020f16f332800ef9d79099 with SHA-1 4480a86810 is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/21470318 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/22428826 Change-Id: I664bda68c8d770cb213f80d601c29c0079a3c1f8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-07Revert "Adding a fix for trimming any large fields before they are inserted ↵Kunal Malhotra
into" am: e374a4bed8 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/22428826 Change-Id: Ida8013adcfd2b03b53f7b3cba2c0f5306335be5f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03Snap for 9874503 from 3bbd5591fa937f74bc17e0b01047eb42c3ab77bc to ↵Android Build Coastguard Worker
tm-qpr3-release Change-Id: I2ccf68a54c7115b41715e9d349bd469cdea38dcd
2023-04-03Merge "Revert "Adding a fix for trimming any large fields before they are ↵TreeHugger Robot
inserted into"" into tm-qpr-dev
2023-04-03Merge "Revert "Adding a fix for trimming any large fields before they are ↵TreeHugger Robot
inserted into"" into tm-qpr-dev
2023-04-03[automerger skipped] Adding a fix for trimming any large fields before they ↵Kunal Malhotra
are inserted into am: f2c030a0fd am: 315ecf82f0 -s ours am skip reason: Merged-In I52814fee6c5e137809020f16f332800ef9d79099 with SHA-1 4480a86810 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/21470318 Change-Id: Ic780deb38af28cbe0df484108d9202bd4f2bf88a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03Revert "Adding a fix for trimming any large fields before they are inserted ↵Kunal Malhotra
into" This reverts commit f2c030a0fd2e0be9c41d7c6605912c925785d0c3. Reason for revert: Shouldn't be backported Change-Id: Id2f6c05c19c7840ef54b65cd3dc7eccef17e864e
2023-04-03Revert "Adding a fix for trimming any large fields before they are inserted ↵Kunal Malhotra
into" This reverts commit 4480a86810cc73a198fbe967685dd8980b375887. Reason for revert: Change shouldn't be backported Change-Id: I50efa4b0f7f897befef64d159f7de61721c6dad3
2023-04-03Revert "Adding a fix for trimming any large fields before they are inserted ↵Kunal Malhotra
into" This reverts commit ddb6cba69fc41836fda8173dbe259ff6f7e33790. Reason for revert: Shouldn't be backported Change-Id: I6e0d113841a4140c541905b4589bc94d6f0db896
2023-04-03Adding a fix for trimming any large fields before they are inserted into am: ↵Kunal Malhotra
f2c030a0fd Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/21470318 Change-Id: I6e3198483b60e36cc90b52934f088593ad969982 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03Merge "Adding a fix for trimming any large fields before they are inserted ↵TreeHugger Robot
into the DB" into tm-qpr-dev
2023-04-03Adding a fix for trimming any large fields before they are inserted intoKunal Malhotra
the DB Test: manual testing done by attempting to add an imported contact with a very large field in it Change-Id: I52814fee6c5e137809020f16f332800ef9d79099 Bug: b/262595156 b/262594744 (cherry picked from commit b915bb73ad6905bf339f5fcf8d47a8f487b0f889) Merged-In: I52814fee6c5e137809020f16f332800ef9d79099
2023-04-03Adding a fix for trimming any large fields before they are inserted intoKunal Malhotra
the DB Test: manual testing done by attempting to add an imported contact with a very large field in it Change-Id: I52814fee6c5e137809020f16f332800ef9d79099 Bug: b/262595156 b/262594744 (cherry picked from commit b915bb73ad6905bf339f5fcf8d47a8f487b0f889) Merged-In: I52814fee6c5e137809020f16f332800ef9d79099
2023-04-03Adding a fix for trimming any large fields before they are inserted intoKunal Malhotra
the DB Test: manual testing done by attempting to add an imported contact with a very large field in it Change-Id: I52814fee6c5e137809020f16f332800ef9d79099 Bug: b/262595156 b/262594744 (cherry picked from commit b915bb73ad6905bf339f5fcf8d47a8f487b0f889) Merged-In: I52814fee6c5e137809020f16f332800ef9d79099
2023-01-10Snap for 9470583 from e8caf207c2e7c08f550daaee3a5e2331848ffd01 to ↵Android Build Coastguard Worker
tm-qpr3-release Change-Id: Ic43c5220f040a48cc2f40d06b0645a05d0434b99
2022-12-29Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I1e5f04c23df3b69d530ba6c7ce797afa8635c283
2022-12-18Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I1912230fcd0bbadf352277c9972add7bde21aca0
2022-12-14Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I521ee3379238b94ef4949a55db0fd8d0faebf0df
2022-10-15Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Iece3d2454ca6980453af0a250e864dee5d8c69bb
2022-07-16Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-devTreeHugger Robot
2022-07-15[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
0027e65404 -s ours am: 1d41d446c9 -s ours am: c22b226bbb -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/19286868 Change-Id: Idd07dc45ca27885277b58dd3dd37552d53ada275 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
0027e65404 -s ours am: 1d41d446c9 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/19286868 Change-Id: I2fe2861004575f5cd36072e517b9a2cc9923d735 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
e9b7ed6c3a -s ours am: 3d6213c86b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/19295697 Change-Id: If476f5b3963e997c8ffa7a5d55e522f50c56d4df Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
5270f026fb -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/19295699 Change-Id: I245bfceeae296890705d6bb5612d12df4aab16d8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
0027e65404 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/19286868 Change-Id: I5439304f496afdc8bf469159afe83b1661c8b980 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
e9b7ed6c3a -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/19295697 Change-Id: Ia48020e8432f5bf975d6b6dd17c7c73d89df186e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I29626a42a1bd6068b27973cbfacb55f0327c2021
2022-07-14Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ia65c734d1a2fd658fae50a566956506f69124dc4
2022-07-14Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I7d53d515427343f2536825203aad787a01093cef
2022-07-13Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I03ab8fed3648469035b1e36905bb4e8ab6ce2abd
2022-06-24[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
460fe3a4df -s ours am: 5f694f4571 -s ours am: 77e24e279b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/18671670 Change-Id: I6f3b405f6533d45af51c462097e897ecf071da66 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24[automerger skipped] enforce stricter CallLogProvider query am: c8b6397d36 ↵Thomas Stuart
am: bfaff79572 -s ours am: 01902a5ab6 -s ours am: 4cee6e7023 -s ours am: 31fab7064e -s ours am: a41242b9ad -s ours am: 156d10a9b1 -s ours am: 4add84fe5e -s ours am skip reason: skipped by user tjstuart Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/18291819 Change-Id: I433093dfe30c378fa216d369e8445b1760f31b6d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24[automerger skipped] enforce stricter CallLogProvider query am: a3bdf569ac ↵Thomas Stuart
am: 9fe9cc94dc -s ours am: 79215f0584 -s ours am: 2d0ceb4307 -s ours am: 7d60c6b917 -s ours am: ac65aae6be -s ours am skip reason: skipped by user tjstuart Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/18281751 Change-Id: Ib783d24460bec1db14a56efb24d089706deb25dd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24[automerger skipped] [automerge] DO NOT MERGE enforce stricter ↵Thomas Stuart
CallLogProvider query 2p: 13d7084790 am: 05f5534c2b -s ours am: 82ab4d207b -s ours am: 4585647b57 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/18281752 Change-Id: I70fbdec521026234815ed727029c81b016a9d472 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
460fe3a4df -s ours am: 5f694f4571 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/18671670 Change-Id: I937b77c119c1cfdfa2b81dfec2c31261203193b8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
460fe3a4df -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/18671670 Change-Id: Ia576fd176bbe290298f377223398ba50dd3c88ee Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24[automerger skipped] enforce stricter CallLogProvider query am: c8b6397d36 ↵Thomas Stuart
am: bfaff79572 -s ours am: 01902a5ab6 -s ours am: 4cee6e7023 -s ours am: 31fab7064e -s ours am: a41242b9ad -s ours am: 156d10a9b1 -s ours am skip reason: skipped by user tjstuart Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/18291819 Change-Id: I79755bd49ec3efbcbf935d20a6a397a0f03b2f7c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24[automerger skipped] enforce stricter CallLogProvider query am: a3bdf569ac ↵Thomas Stuart
am: 9fe9cc94dc -s ours am: 79215f0584 -s ours am: 2d0ceb4307 -s ours am: 7d60c6b917 -s ours am skip reason: skipped by user tjstuart Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/18281751 Change-Id: I1256134d26b1528619e34364f95b4741128cbbd5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24[automerger skipped] [automerge] DO NOT MERGE enforce stricter ↵Thomas Stuart
CallLogProvider query 2p: 13d7084790 am: 05f5534c2b -s ours am: 82ab4d207b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/18281752 Change-Id: Ibd0eb43c8019b783984f4e292f0e961fc5547f70 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24[automerger skipped] enforce stricter CallLogProvider query am: c8b6397d36 ↵Thomas Stuart
am: bfaff79572 -s ours am: 01902a5ab6 -s ours am: 4cee6e7023 -s ours am: 31fab7064e -s ours am: a41242b9ad -s ours am skip reason: skipped by user tjstuart Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/18291819 Change-Id: Ib9dbe89ff684e5b419fe3267f2dd734d53f4355c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24[automerger skipped] enforce stricter CallLogProvider query am: a3bdf569ac ↵Thomas Stuart
am: 9fe9cc94dc -s ours am: 79215f0584 -s ours am: 2d0ceb4307 -s ours am skip reason: skipped by user tjstuart Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/18281751 Change-Id: I849bf1b2150b1753bb12ae7782d70dae8feca317 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24[automerger skipped] [automerge] DO NOT MERGE enforce stricter ↵Thomas Stuart
CallLogProvider query 2p: 13d7084790 am: 05f5534c2b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/18281752 Change-Id: If2a149a86f186f426d0078a19f91e3b2fed12358 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04Merge "Add null-check for SubscriptionInfo when trying to get IccId." into ↵Tyler Gunn
tm-dev am: 529cd5265b am: 1f652fa65d Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/18675640 Change-Id: I23a5a11973fd904f9eb2adf71bd89cdfdfeca15d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04Merge "Add null-check for SubscriptionInfo when trying to get IccId." into ↵Tyler Gunn
tm-dev am: 529cd5265b Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/18675640 Change-Id: I398cb7c9196e2b978c3cd22663e4a83465df9ca8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-03Merge "Add null-check for SubscriptionInfo when trying to get IccId." into ↵android13-devTyler Gunn
tm-dev
2022-06-02[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
tm-d1-dev am: a655a19b8a -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/18671675 Change-Id: I9492a96121c24b96a4c264367330a58abd3dd24c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
f43cd83a37 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/18671675 Change-Id: I95d37aa4be7d2eb551c6e33585adaf5a31d16f8f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-devTreeHugger Robot
2022-06-02Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-devTreeHugger Robot
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 02:01:33 +0000