aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
13 daysMerge "Snap for 11754915 from b90bfe114310f07fcf6a2d0b7d35d269fc6c5cce to ↵sdk-releaseAndroid Build Coastguard Worker
sdk-release" into sdk-release
13 daysSnap for 11754915 from b90bfe114310f07fcf6a2d0b7d35d269fc6c5cce to sdk-releaseAndroid Build Coastguard Worker
Change-Id: I654877f500c73789028ff282cad1c0acaa766506
2024-04-22Merge "Migrate Test Targets to New Android Ownership Model" into mainHEADmastermainTreehugger Robot
2024-03-12Merge "Snap for 11566117 from 5af4c203d3fef3fc6d49cbef6bc5308a87a2f223 to ↵platform-tools-35.0.1Android Build Coastguard Worker
sdk-release" into sdk-release
2024-03-12Snap for 11566117 from 5af4c203d3fef3fc6d49cbef6bc5308a87a2f223 to sdk-releaseAndroid Build Coastguard Worker
Change-Id: I757213caea6c65c4cbd2dd1aca05c00b03afc6ea
2024-03-07Merge "Merge Android 14 QPR2 to AOSP main" into mainXin Li
2024-03-06Merge Android 14 QPR2 to AOSP mainXin Li
Bug: 319669529 Merged-In: Ia3c08524a7476566e8f85a79c15af583fd65f16a Change-Id: I4310460d119fbfadb93399107644ef19f776343f
2024-02-02Migrate Test Targets to New Android Ownership ModelAditya Choudhary
This CL is created as a best effort to migrate test targets to the new Android ownership model. It is based on historical data from repository history and insights from git blame. Given the nature of this effort, there may be instances of incorrect attribution. If you find incorrect or unnecessary attribution in this CL, please create a new CL to fix that. For detailed guidelines and further information on the migration please refer to the link below, go/new-android-ownership-model Bug: 304529413 Test: N/A Change-Id: I20cbb69ab65e62246afe8d1b087baf73c7dc1c72
2024-01-31Merge "Snap for 11380902 from a3c215a1e51bcee7087d5e676fdeaafc2ad96328 to ↵Android Build Coastguard Worker
sdk-release" into sdk-release
2024-01-31Snap for 11380902 from a3c215a1e51bcee7087d5e676fdeaafc2ad96328 to sdk-releaseAndroid Build Coastguard Worker
Change-Id: I5b72add85c88ceaff76906744a50a85835223121
2024-01-29Merge Android 24Q1 Release (ab/11220357)temp_319669529Xin Li
Bug: 319669529 Merged-In: Iac8d186f9d442f8bfccf834fb52d407653622f38 Change-Id: Ia3c08524a7476566e8f85a79c15af583fd65f16a
2024-01-27Merge "Make sure to close cursors" into main am: a3c215a1e5Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/2361131 Change-Id: I5479c56f3b16e3509ca50ed7e275d5235ba84b85 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-27Merge "Make sure to close cursors" into mainTreehugger Robot
2024-01-24Make sure to close cursorsMattias Nilsson
ContactsProvider leaks resources when being used. Test: Manual Bug: 263295543 Change-Id: I5c7d448c963bc6b32e97b20b33a5bde5959f6197
2023-12-13Merge "Snap for 11211409 from 3acc21a7154ded85273f31cf2e17d4d39b98236d to ↵Android Build Coastguard Worker
sdk-release" into sdk-release
2023-12-13Snap for 11211409 from 3acc21a7154ded85273f31cf2e17d4d39b98236d to sdk-releaseAndroid Build Coastguard Worker
Change-Id: Ia8f71b476898cb02d5e451d8b5a345e75d44c5aa
2023-12-11[automerger skipped] Merge "Merge Android 14 QPR1" into main am: 3acc21a715 ↵Xin Li
-s ours am: ea73aa4e88 -s ours am: 8ea8693845 -s ours am skip reason: Merged-In I880a85493c46efc41a146c1a9721e4662397f2c7 with SHA-1 cff7500574 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/2865784 Change-Id: I18dbff189e43bb4349d1df7df323a17ea61b1843 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: cfd58453d6 -s ours am: ↵Xin Li
866fb8c043 -s ours am: 97a057f604 -s ours am skip reason: Merged-In I880a85493c46efc41a146c1a9721e4662397f2c7 with SHA-1 cff7500574 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/2865784 Change-Id: I6d0ffe0ba2b375b299a20f623bba8c78b80e0188 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge "Merge Android 14 QPR1" into main am: 3acc21a715 ↵Xin Li
-s ours am: ea73aa4e88 -s ours am skip reason: Merged-In I880a85493c46efc41a146c1a9721e4662397f2c7 with SHA-1 cff7500574 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/2865784 Change-Id: Ib119178ea341434b121a587936067bc27c88bff1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: cfd58453d6 -s ours am: ↵Xin Li
866fb8c043 -s ours am skip reason: Merged-In I880a85493c46efc41a146c1a9721e4662397f2c7 with SHA-1 cff7500574 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/2865784 Change-Id: I08c56b20c624674fd34c86c1bcf5febd2868b622 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge "Merge Android 14 QPR1" into main am: 3acc21a715 ↵Xin Li
-s ours am skip reason: Merged-In I880a85493c46efc41a146c1a9721e4662397f2c7 with SHA-1 cff7500574 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/2865784 Change-Id: Id81310f48237ca9ffae8c200a5d1669230345364 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: cfd58453d6 -s oursXin Li
am skip reason: Merged-In I880a85493c46efc41a146c1a9721e4662397f2c7 with SHA-1 cff7500574 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/2865784 Change-Id: I9f8db6ea3be9f302fcaa2dbbdc585669c82da763 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-09Merge "Merge Android 14 QPR1" into mainXin Li
2023-12-08Merge Android 14 QPR1Xin Li
Merged-In: I880a85493c46efc41a146c1a9721e4662397f2c7 Bug: 315507370 Change-Id: If612bbc4764b8eb27c79fff95ac3c688a4cd516d
2023-10-31Merge "CP2 handling of stopped state apps" into mainIshneet Ahuja
2023-10-25CP2 handling of stopped state appsIshneet Ahuja
This includes changes required for handling stopped state apps in CP2. Bug: 300253342 Test: atest ContactsProviderTests CtsContactsProviderTestCases, Manual testing by following go/cp2-stopped-state-apps-testing Change-Id: Iac8d186f9d442f8bfccf834fb52d407653622f38
2023-10-19[automerger skipped] Merge 10952656 am: cff7500574 -s ours am: 2e228be991 -s ↵Xin Li
ours am skip reason: Merged-In I70c19030ffee01ba303683ccbdbdec41204e9771 with SHA-1 a1145439b1 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/25089575 Change-Id: I7ed811d2ffff66d9980f5eb794e9921f42c47260 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19[automerger skipped] Merge 10952656 am: cff7500574 -s oursXin Li
am skip reason: Merged-In I70c19030ffee01ba303683ccbdbdec41204e9771 with SHA-1 a1145439b1 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/25089575 Change-Id: Idafcb14260e3d4a1b92031fbb1b8017b1dd945d5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-17Merge 10952656tmp_amf_315507370Xin Li
Merged-In: I70c19030ffee01ba303683ccbdbdec41204e9771 Change-Id: I880a85493c46efc41a146c1a9721e4662397f2c7
2023-10-11Merge "Snap for 10929834 from 64d5ca4720c680875ebca70e02649201d8fc45e3 to ↵Android Build Coastguard Worker
sdk-release" into sdk-release
2023-10-10Snap for 10929834 from 64d5ca4720c680875ebca70e02649201d8fc45e3 to sdk-releaseAndroid Build Coastguard Worker
Change-Id: I235bb30b003b6783d8b4c3816ec159d02337921d
2023-10-07[automerger skipped] Merge "Merge Android 14" into main am: 64d5ca4720 -s ↵Xin Li
ours am: e2af0ead71 -s ours am: c8bc958464 -s ours am: 6ea5f077bf -s ours am: a1145439b1 -s ours am skip reason: Merged-In I0a92ef586db9c5a383f70274839daca17fd74f6d with SHA-1 e8afe56b5d is already in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/2776940 Change-Id: I9f167acb151ab69bd5d91c663dad1faf7a275459 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07[automerger skipped] Merge Android 14 am: 0aa88f803e -s ours am: bdfe007da5 ↵Xin Li
-s ours am: bd90a162f2 -s ours am: 653f3e0f02 -s ours am: 5c9ee64260 -s ours am skip reason: Merged-In I0a92ef586db9c5a383f70274839daca17fd74f6d with SHA-1 e8afe56b5d is already in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/2776940 Change-Id: I72dc960c36632a63a2bb07ab84f85cdf241aabb0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: 64d5ca4720 -s ↵Xin Li
ours am: e2af0ead71 -s ours am: c8bc958464 -s ours am: 6ea5f077bf -s ours am skip reason: Merged-In I0a92ef586db9c5a383f70274839daca17fd74f6d with SHA-1 e8afe56b5d is already in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/2776940 Change-Id: I70c19030ffee01ba303683ccbdbdec41204e9771 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 0aa88f803e -s ours am: bdfe007da5 ↵Xin Li
-s ours am: bd90a162f2 -s ours am: 653f3e0f02 -s ours am skip reason: Merged-In I0a92ef586db9c5a383f70274839daca17fd74f6d with SHA-1 e8afe56b5d is already in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/2776940 Change-Id: Ib72cad460729d6b54ff56e73edcc725b8a1bc0c1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: 64d5ca4720 -s ↵Xin Li
ours am: e2af0ead71 -s ours am: c8bc958464 -s ours am skip reason: Merged-In I0a92ef586db9c5a383f70274839daca17fd74f6d with SHA-1 e8afe56b5d is already in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/2776940 Change-Id: I641cff334cddfb286dcec961dc23bf9226c53898 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 0aa88f803e -s ours am: bdfe007da5 ↵Xin Li
-s ours am: bd90a162f2 -s ours am skip reason: Merged-In I0a92ef586db9c5a383f70274839daca17fd74f6d with SHA-1 e8afe56b5d is already in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/2776940 Change-Id: I8123b1f3eeb04b96104937acffb8f6b998037e6c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: 64d5ca4720 -s ↵Xin Li
ours am: e2af0ead71 -s ours am skip reason: Merged-In I0a92ef586db9c5a383f70274839daca17fd74f6d with SHA-1 e8afe56b5d is already in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/2776940 Change-Id: I3568214d98cd31d2a0fa9ee265f0ac0886598310 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 0aa88f803e -s ours am: bdfe007da5 ↵Xin Li
-s ours am skip reason: Merged-In I0a92ef586db9c5a383f70274839daca17fd74f6d with SHA-1 e8afe56b5d is already in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/2776940 Change-Id: I27799d7f12aa9645d6501e9fa7e035377739061b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: 64d5ca4720 -s oursXin Li
am skip reason: Merged-In I0a92ef586db9c5a383f70274839daca17fd74f6d with SHA-1 e8afe56b5d is already in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/2776940 Change-Id: I1f3f950609adf4df9cc36945162df26f12455d4f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 0aa88f803e -s oursXin Li
am skip reason: Merged-In I0a92ef586db9c5a383f70274839daca17fd74f6d with SHA-1 e8afe56b5d is already in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/2776940 Change-Id: I0f12f67b6ca82685bc1c56e51d12db694d30f4b1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06Merge "Merge Android 14" into mainXin Li
2023-10-05Merge Android 14Xin Li
Bug: 298295554 Merged-In: I0a92ef586db9c5a383f70274839daca17fd74f6d Change-Id: Idb318d89eba83157b46846e29458d6e3b6e562d4
2023-10-04Merge "Snap for 10900817 from a631f3aade06e25bd170c0a372f7617ec6ed2261 to ↵platform-tools-34.0.5Android Build Coastguard Worker
sdk-release" into sdk-release
2023-10-04Snap for 10900817 from a631f3aade06e25bd170c0a372f7617ec6ed2261 to sdk-releaseAndroid Build Coastguard Worker
Change-Id: I8703d5973f353e82593256240a87c8b2c481f5cd
2023-09-15Added PreUpload config in CP2 for checking code styleAshish Kumar
Bug: b/300645229 Test: build Change-Id: I160ba8d4c7d9a843cb128de6cb281f53ed1fe119
2023-08-31[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
e8afe56b5d -s ours am: 6f6d4ab475 -s ours am: 539708ab75 -s ours am: a63217f144 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/24607344 Change-Id: If8f96a288d51138538e16f906c94bbc3270fae38 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
e8afe56b5d -s ours am: 6f6d4ab475 -s ours am: 539708ab75 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/24607344 Change-Id: I2eb7e0c6333ccb6bb27e5bf021ed5ec702ad5422 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
e8afe56b5d -s ours am: 6f6d4ab475 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/24607344 Change-Id: I74d6b463c464248c32808f8874eb79d5d4158c30 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
e8afe56b5d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/24607344 Change-Id: Ib8697be4e6a0badfb671737f755f70eddba25d6f 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-05-06 17:21:04 +0000