aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-10-10Snap for 9157512 from 0027e65404f4501e0a4c099d161e437dd48f18e2 to ↵aml_tz3_314012070aml_tz3_314012050aml_tz3_314012010aml_tz3_313110000aml_tz3_312511020aml_tz3_312511010aml_tz3_312410020aml_tz3_312410010android12-mainline-tzdata3-releaseaml_tz3_314012010Android Build Coastguard Worker
mainline-tzdata3-release Change-Id: I0970b7510aad6a02ea0f6e1a8106b9282a7ffa36
2022-07-13Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I03ab8fed3648469035b1e36905bb4e8ab6ce2abd
2022-06-15Snap for 8730993 from 460fe3a4df6fe68442abdf4d7421ba4783dc5feb to ↵Android Build Coastguard Worker
mainline-tzdata3-release Change-Id: I5f1ec3052c729a96b2709ef9bdd5e22a031c573d
2022-06-15Snap for 8727584 from d2d05083feac1f3fa2fab19479ba7fc459f6b324 to ↵Android Build Coastguard Worker
mainline-tzdata3-release Change-Id: I34d669eec379698f872720e33d7ea9434c6ddbdc
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: Icecf6083ac83b4da54df0de732ed89fc5c09d8f5 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-01[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
1c84272941 -s ours am: 936e030d6c -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/18693452 Change-Id: I55cbf706830ba304f7fada0ce36de4d416384e21 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
1c84272941 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/18693452 Change-Id: Id7adbd0033a3f8ae8617f68e1f68e9f0e1f52e2e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01Add null-check for SubscriptionInfo when trying to get IccId.Grace Jia
Bug: 234337531 Test: CallLogProviderTest Change-Id: I8f27f053ab10969617dd2850cb327548a0e2d467
2022-05-31Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I26e1c72a0f0efafe4f6a94ff9a6698f025d57adf
2022-06-01Change the CP2 logging to be correct order. The order of the logging fields ↵Dongzhuo Zhang
must match the one in atoms.proto. am: 16a3c34791 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/18600557 Change-Id: If19efce9c6eb350f485220a0c90ffc4ca64bfbcf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31Change the CP2 logging to be correct order. The order of the logging fields ↵Dongzhuo Zhang
must match the one in atoms.proto. This issue was initially introduced in T, so we need Dr.No approval to get this in T. Bug: b/233950995 Change-Id: Ie9a12bc2539a7eac78c20f02b15302badfed77f1
2022-05-31Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ia57168f69c936b9a6e93be7feffaca1b26c5318b
2022-05-29Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodTreeHugger Robot
2022-05-27[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
399865a888 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/18629202 Change-Id: Ifde88a9c811726da0ea4b4992a401d50a5acece3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I4de97c2678b675d3be2d0242b45e00a7e2f20c22
2022-05-26Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ic0d0d6368257d3d19b7888226191ec9f5fb2e196
2022-05-20Snap for 8618812 from 909eeb8bdf7a1abb320794ab2aebd9d82a2c4d5d to ↵Android Build Coastguard Worker
mainline-tzdata3-release Change-Id: I17785f2dc41d045ec0c1cd0cd85ecf2956f4918f
2022-05-19[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: 87380915fb -s ours am: 56b8fe6829 -s ours am: 3dc6c97447 -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: I679648f9bbf8189f143a9e0d0915bec71bdcb856 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19[automerger skipped] enforce stricter CallLogProvider query am: a3bdf569ac ↵Thomas Stuart
am: 9fe9cc94dc -s ours am: 79215f0584 -s ours am: a0cdcad982 -s ours am: 785309cde0 -s ours am: c394f1ec82 -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: I750e04622eeaf0173a89d13c33272372d4732a14 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19[automerger skipped] [automerge] DO NOT MERGE enforce stricter ↵Thomas Stuart
CallLogProvider query 2p: 13d7084790 am: 6612194f24 -s ours am: e560a9771b -s ours am: 98828f62a6 -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: I06d35e3d8db2070edcb61d22754cac8be4fbbbe4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19[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: 87380915fb -s ours am: 56b8fe6829 -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: I9e46a4614f051420081d405ad989ce6703954dca Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19[automerger skipped] enforce stricter CallLogProvider query am: a3bdf569ac ↵Thomas Stuart
am: 9fe9cc94dc -s ours am: 79215f0584 -s ours am: a0cdcad982 -s ours am: 785309cde0 -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: I673462250019979bc3543dc912edcec086ef1120 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19[automerger skipped] [automerge] DO NOT MERGE enforce stricter ↵Thomas Stuart
CallLogProvider query 2p: 13d7084790 am: 6612194f24 -s ours am: e560a9771b -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: I737683bbe9d3cbc55f57ab18b63cfecf20f36175 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19[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: 87380915fb -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: Ib4c97fcb44477cec97fdc400eb912c444709811f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19[automerger skipped] enforce stricter CallLogProvider query am: a3bdf569ac ↵Thomas Stuart
am: 9fe9cc94dc -s ours am: 79215f0584 -s ours am: a0cdcad982 -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: I45e584fb6f94ef4e1924d9c65e374ad91cf9a6a8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19[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 skip reason: skipped by user tjstuart Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/18291819 Change-Id: Iaf98b6e144ceda196a7acb7ab89a3eb67aad3224 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19[automerger skipped] enforce stricter CallLogProvider query am: a3bdf569ac ↵Thomas Stuart
am: 9fe9cc94dc -s ours am: 79215f0584 -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: Id632786ed02be2dc61f6848e5d0d11b0d3c9e4ea Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19[automerger skipped] [automerge] DO NOT MERGE enforce stricter ↵Thomas Stuart
CallLogProvider query 2p: 13d7084790 am: 6612194f24 -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: I11d0b4bde821bcd980baaa57cc2708cbe2a31b17 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19[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 skip reason: skipped by user tjstuart Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/18291819 Change-Id: Idc82a15c295235b72d4d5108a0d9c59e3f2db868 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19[automerger skipped] enforce stricter CallLogProvider query am: a3bdf569ac ↵Thomas Stuart
am: 9fe9cc94dc -s ours am: 79215f0584 -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: I7de4b24da31c9814fd730544f03c26d6424ba7d2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19[automerger skipped] enforce stricter CallLogProvider query am: c8b6397d36 ↵Thomas Stuart
am: bfaff79572 -s ours am: 01902a5ab6 -s ours am: 4cee6e7023 -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: Ie802a55c92a485e848bbffdd8ad986462810c942 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19[automerger skipped] enforce stricter CallLogProvider query am: a3bdf569ac ↵Thomas Stuart
am: 9fe9cc94dc -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: Iff931c0d1e427aec81ef2c859c44bc99c4d1f858 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19[automerge] DO NOT MERGE enforce stricter CallLogProvider query 2p: 13d7084790Thomas Stuart
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/18281752 Bug: 224771921 Change-Id: Ie07ece61f31d693c8fbe1f05b2f0e5fbec6915ba
2022-05-19[automerge] DO NOT MERGE enforce stricter CallLogProvider query 2p: 13d7084790Thomas Stuart
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/18281752 Bug: 224771921 Change-Id: I1365dfdf8c7768212fd6e01325f16645780e0132
2022-05-19[automerger skipped] enforce stricter CallLogProvider query am: c8b6397d36 ↵Thomas Stuart
am: bfaff79572 -s ours am: 01902a5ab6 -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: Ia383fffa6eb455adf806882a4b57d63b2836d5a2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19enforce stricter CallLogProvider query am: a3bdf569acThomas Stuart
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/18281751 Change-Id: Ib3b71d302b34b73e4d9c55cb3ac15af69eb8a875 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19[automerger skipped] enforce stricter CallLogProvider query am: c8b6397d36 ↵Thomas Stuart
am: bfaff79572 -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: I51e99f4152c1e68afca33ce44422803a5a6d63ec Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18[automerger skipped] enforce stricter CallLogProvider query am: 890af6a4b1 ↵Thomas Stuart
-s ours am: 896023ae64 -s ours am skip reason: Merged-In Ia445bb59581abb14e247aa8d9f0177e02307cf96 with SHA-1 571be94b55 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/18321297 Change-Id: I6e7f0cd916df77f59501df5722a09b7411178d02 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18enforce stricter CallLogProvider query am: c8b6397d36Thomas Stuart
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/18291819 Change-Id: Ibe6541a38d25c41b5bd2360290b7bfb9d37c2bc6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18[automerger skipped] enforce stricter CallLogProvider query am: 890af6a4b1 ↵Thomas Stuart
-s ours am skip reason: Merged-In Ia445bb59581abb14e247aa8d9f0177e02307cf96 with SHA-1 571be94b55 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/18321297 Change-Id: I1c0c13e5afaec2404da545aaaec59ba9b853a345 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-17Snap for 8603585 from ac86a9dff1f06f772d028d12390bd26a19856f0e to ↵Android Build Coastguard Worker
mainline-tzdata3-release Change-Id: I7373825ba8cc81bb06b1fcee97fa286d40fcc7b1
2022-05-13enforce stricter CallLogProvider queryThomas Stuart
changes: - phoneNumber is now a selectionArgument - if the user makes a query request for the CALLS_FILTER case, throw a SE if the cursor is empty && SQL is detected Bug: 224771921 Test: 2 manual, manual 1: test app 1 can still make valid call filter query manual 2: test app 2 with invalid query crashes b/c of SE 2 CTS tests, test 1: ensures the existing functionality still works test 2: ensures a SE is thrown on an invalid query for call filter Change-Id: Ia445bb59581abb14e247aa8d9f0177e02307cf96 Merged-In: Ia445bb59581abb14e247aa8d9f0177e02307cf96
2022-05-13enforce stricter CallLogProvider queryThomas Stuart
changes: - phoneNumber is now a selectionArgument - if the user makes a query request for the CALLS_FILTER case, throw a SE if the cursor is empty && SQL is detected Bug: 224771921 Test: 2 manual, manual 1: test app 1 can still make valid call filter query manual 2: test app 2 with invalid query crashes b/c of SE 2 CTS tests, test 1: ensures the existing functionality still works test 2: ensures a SE is thrown on an invalid query for call filter Change-Id: Ia445bb59581abb14e247aa8d9f0177e02307cf96 Merged-In: Ia445bb59581abb14e247aa8d9f0177e02307cf96
2022-05-13enforce stricter CallLogProvider queryThomas Stuart
changes: - phoneNumber is now a selectionArgument - if the user makes a query request for the CALLS_FILTER case, throw a SE if the cursor is empty && SQL is detected Bug: 224771921 Test: 2 manual, manual 1: test app 1 can still make valid call filter query manual 2: test app 2 with invalid query crashes b/c of SE 2 CTS tests, test 1: ensures the existing functionality still works test 2: ensures a SE is thrown on an invalid query for call filter Change-Id: Ia445bb59581abb14e247aa8d9f0177e02307cf96 Merged-In: Ia445bb59581abb14e247aa8d9f0177e02307cf96
2022-05-12enforce stricter CallLogProvider query am: 571be94b55Thomas Stuart
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/18083876 Change-Id: I99fd2ae51cb525ab1506318e63fd12f5254a0670 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11DO NOT MERGE enforce stricter CallLogProvider queryThomas Stuart
changes: - phoneNumber is now a selectionArgument - if the user makes a query request for the CALLS_FILTER case, throw a SE if the cursor is empty && SQL is detected Bug: 224771921 Test: 2 manual, manual 1: test app 1 can still make valid call filter query manual 2: test app 2 with invalid query crashes b/c of SE 2 CTS tests, test 1: ensures the existing functionality still works test 2: ensures a SE is thrown on an invalid query for call filter Change-Id: Ia445bb59581abb14e247aa8d9f0177e02307cf96
2022-05-10enforce stricter CallLogProvider queryThomas Stuart
changes: - phoneNumber is now a selectionArgument - if the user makes a query request for the CALLS_FILTER case, throw a SE if the cursor is empty && SQL is detected Bug: 224771921 Test: 2 manual, manual 1: test app 1 can still make valid call filter query manual 2: test app 2 with invalid query crashes b/c of SE 2 CTS tests, test 1: ensures the existing functionality still works test 2: ensures a SE is thrown on an invalid query for call filter Change-Id: Ia445bb59581abb14e247aa8d9f0177e02307cf96
2022-04-29[automerger skipped] Merge "DO NOT MERGE Add check that prevents file ↵Thomas Stuart
operations outside of Call Composer Dir" into sc-v2-dev am: 888ef6f2b6 -s ours am: 761290c259 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/17949644 Change-Id: Ia83c195ad0d7122a9a0c632afbf1a3e1ed4adc0b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29[automerger skipped] DO NOT MERGE Add check that prevents file operations ↵Thomas Stuart
outside of Call Composer Dir am: 5fd7ebb59d -s ours am: c81e7f852c -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/17949644 Change-Id: Iba56882e57f6460a38c7a40dc87947d1b819cd2f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 20:51:34 +0000