summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-01-28Merge "Fix licenses and license texts."android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Treehugger Robot
2022-01-27Fix licenses and license texts.Bob Badour
Entire project is 1p. Test: m nothing Change-Id: I09327a1f93aa83cb5a9f9f56c92c55669f0dd0e6
2021-10-08[automerger skipped] Merge "Merge Android 12" am: b0cc975fe1 -s ours am: ↵Xin Li
8faa4ced33 -s ours am: 59069153c9 -s ours am skip reason: Merged-In I203c591917c9da5b44f12c9822522e0f4cc15599 with SHA-1 a6ae5c949e is already in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/1847711 Change-Id: Ic91e2d8ca8bb10d2c41c49bd019a9874febd55d4
2021-10-08[automerger skipped] Merge "Merge Android 12" am: b0cc975fe1 -s ours am: ↵Xin Li
8faa4ced33 -s ours am skip reason: Merged-In I203c591917c9da5b44f12c9822522e0f4cc15599 with SHA-1 a6ae5c949e is already in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/1847711 Change-Id: I1b4fab7bd6909f2beff6a003139c96118316fa8c
2021-10-08[automerger skipped] Merge "Merge Android 12" am: b0cc975fe1 -s oursXin Li
am skip reason: Merged-In I203c591917c9da5b44f12c9822522e0f4cc15599 with SHA-1 a6ae5c949e is already in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/1847711 Change-Id: I5c40bd5e40f0707aad8d6f892635c048d1fe38c4
2021-10-07Merge "Merge Android 12"android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Xin Li
2021-10-06Merge Android 12Xin Li
Bug: 202323961 Merged-In: I203c591917c9da5b44f12c9822522e0f4cc15599 Change-Id: Ic1c7774558534033dd84dc681fa23afa6a876895
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
a6ae5c949e -s ours am: 224e67288f -s ours am skip reason: Merged-In I484fe79efdf22d5e7eec7d7bee43a7f622115244 with SHA-1 cc26be6127 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/15571809 Change-Id: I7aa12f30a9a9c6958a1c27259511ce0081d6cb4b
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
a6ae5c949e -s ours am skip reason: Merged-In I484fe79efdf22d5e7eec7d7bee43a7f622115244 with SHA-1 cc26be6127 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/15571809 Change-Id: I4a23795666e891a97df2cb769bc73e2eb84fec99
2021-08-14Merge sc-dev-plus-aosp-without-vendor@7634622temp_sam_202323961Xin Li
Merged-In: I484fe79efdf22d5e7eec7d7bee43a7f622115244 Change-Id: I203c591917c9da5b44f12c9822522e0f4cc15599
2021-06-22Add READ_PHONE_NUMBERS permission to get phone account from Telecom. am: ↵Grace Jia
91de5bb89e Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/15053494 Change-Id: I484fe79efdf22d5e7eec7d7bee43a7f622115244
2021-06-21Add READ_PHONE_NUMBERS permission to get phone account from Telecom.android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devGrace Jia
Bug: 183407956 Test: UnitTest, CTS test Change-Id: I622887ec2621be1e8f46c5f8d7067ecae2cd984a (cherry picked from commit e072f8b83882177bdf4af88c7fe9e6b6cabc6345)
2021-02-21[automerger skipped] Mark ab/7061308 as merged in stage. am: 3dfeb14d28 -s ↵Xin Li
ours am: dac515acc9 -s ours am skip reason: Change-Id Icb7b03ca404c32460b1bea7d94a4d891d707134b with SHA-1 f8600c44c7 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib57a1b916044a7965afc0a32668610ec2e22981b
2021-02-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to ↵Bob Badour
packages/providers/UserDictionaryProvider" am: 3d8f01b7a4 am: 64123569bf am: a13ac9e26d Original change: https://android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/1588506 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5034737e6f9e091b6dd3594fa6ba26ee5ce4b56c
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 3dfeb14d28 -s oursXin Li
am skip reason: Change-Id Icb7b03ca404c32460b1bea7d94a4d891d707134b with SHA-1 f8600c44c7 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5a888f4f9ae71ba335a097098868e4c247e3e49b
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Xin Li
Bug: 180401296 Merged-In: Icb7b03ca404c32460b1bea7d94a4d891d707134b Change-Id: Ia79fee25e05205f539ed9b79a80ee12109db38b3
2021-02-19Merge "[LSC] Add LOCAL_LICENSE_KINDS to ↵Bob Badour
packages/providers/UserDictionaryProvider" am: 3d8f01b7a4 am: 64123569bf Original change: https://android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/1588506 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I969c3914373835b74739e5baa53108a60c8c8ff3
2021-02-19Merge "[LSC] Add LOCAL_LICENSE_KINDS to ↵Bob Badour
packages/providers/UserDictionaryProvider" am: 3d8f01b7a4 Original change: https://android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/1588506 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2e50b5ba1191de7a361b451d8d9014da83f57f93
2021-02-19Merge "[LSC] Add LOCAL_LICENSE_KINDS to ↵Bob Badour
packages/providers/UserDictionaryProvider"
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to packages/providers/UserDictionaryProviderBob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ica2eb13f0de778dfeeef702d9bb34fad9183d99e
2020-11-23Mark ab/6881855 as merged am: 059da03898 am: f8600c44c7Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/13113005 Change-Id: Id327935d60f00f08736066309aaeffd907c9d5ab
2020-11-23Mark ab/6881855 as merged am: 059da03898Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/13113005 Change-Id: Icb7b03ca404c32460b1bea7d94a4d891d707134b
2020-11-23Mark ab/6881855 as mergedandroid-s-preview-1Xin Li
Bug: 172690556 Change-Id: I80430d89de2ecc4984db86ed1a0346092f34ec27
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 4f0e12b894 -s ours am: ↵Xin Li
29f9af1834 -s ours am: dbc31a5f41 -s ours am skip reason: Change-Id I25d173f4757e675caf00abd3eae2984e988e8ed4 with SHA-1 766f3fab08 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/12795834 Change-Id: I7ea96f942e6509b52a900420551c106c7ab19942
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 4f0e12b894 -s ours am: ↵Xin Li
29f9af1834 -s ours am skip reason: Change-Id I25d173f4757e675caf00abd3eae2984e988e8ed4 with SHA-1 766f3fab08 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/12795834 Change-Id: I2a5ce2492c61ae869be1991994faec35c5cde017
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 4f0e12b894 -s oursXin Li
am skip reason: Change-Id I25d173f4757e675caf00abd3eae2984e988e8ed4 with SHA-1 766f3fab08 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/12795834 Change-Id: I0dd2bea881c2927c2fb490d51c08bb9631975f0e
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I25d173f4757e675caf00abd3eae2984e988e8ed4 Change-Id: I4251e0dbc6f77fde0c691163ae231b7417acf44c
2020-09-11[automerger skipped] Merge "Merge Android R" am: 726339a27c -s ours am: ↵Xin Li
b5a25cc133 -s ours am: c6ebd53d8f -s ours am: 8d2d0dc093 -s ours am: f79a0fac2c -s ours am skip reason: Change-Id Id7ed53db36cdb9e96c352253ca5c05cc193bb90b with SHA-1 187c51de8b is in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/1421784 Change-Id: I801bed4a878209abdc25c34b84dde20f1da3fdcc
2020-09-11[automerger skipped] Merge "Merge Android R" am: 726339a27c -s ours am: ↵Xin Li
b5a25cc133 -s ours am: c6ebd53d8f -s ours am: 8d2d0dc093 -s ours am skip reason: Change-Id Id7ed53db36cdb9e96c352253ca5c05cc193bb90b with SHA-1 187c51de8b is in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/1421784 Change-Id: Ia4de100ab2d03dc9a44d581e6e03d4bb5ff59631
2020-09-11[automerger skipped] Merge "Merge Android R" am: 726339a27c -s ours am: ↵Xin Li
b5a25cc133 -s ours am: c6ebd53d8f -s ours am skip reason: Change-Id Id7ed53db36cdb9e96c352253ca5c05cc193bb90b with SHA-1 187c51de8b is in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/1421784 Change-Id: I81631224dee843930c5223b1d5bf085ff3595970
2020-09-11[automerger skipped] Merge "Merge Android R" am: 726339a27c -s ours am: ↵Xin Li
b5a25cc133 -s ours am skip reason: Change-Id Id7ed53db36cdb9e96c352253ca5c05cc193bb90b with SHA-1 187c51de8b is in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/1421784 Change-Id: Idac35caffbc6921700f1ad98549b14bc80bdcb0c
2020-09-11[automerger skipped] Merge "Merge Android R" am: 726339a27c -s oursXin Li
am skip reason: Change-Id Id7ed53db36cdb9e96c352253ca5c05cc193bb90b with SHA-1 187c51de8b is in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/1421784 Change-Id: I2684c63f3e949092af2267b95ee6f7eb414062bc
2020-09-10Merge "Merge Android R"Xin Li
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: Id7ed53db36cdb9e96c352253ca5c05cc193bb90b Change-Id: I31f722e8e4520f9d82b6c96e8fdfd3b39a9559c1
2020-09-02[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 187c51de8b -s ours am: 21f1bc963d -s ours am: e7e8a16b75 -s ours am: 5e5fe06de6 -s ours am skip reason: Change-Id Iff102d5d44046659da3ebe0b13b7f3390f056bcc with SHA-1 c1541edc08 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/12470197 Change-Id: Ib118f312e7a6cf1f5979230d1bddd50117fc8f43
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 187c51de8b -s ours am: 21f1bc963d -s ours am: e7e8a16b75 -s ours am skip reason: Change-Id Iff102d5d44046659da3ebe0b13b7f3390f056bcc with SHA-1 c1541edc08 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/12470197 Change-Id: I5ab5214a00fdb7d01dca32b95c1f9604748ffa3d
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 187c51de8b -s ours am: 21f1bc963d -s ours am skip reason: Change-Id Iff102d5d44046659da3ebe0b13b7f3390f056bcc with SHA-1 c1541edc08 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/12470197 Change-Id: I8def8e5c4d60a958d464b6b167d884b8d8ff4f14
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 187c51de8b -s ours am skip reason: Change-Id Iff102d5d44046659da3ebe0b13b7f3390f056bcc with SHA-1 c1541edc08 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/12470197 Change-Id: I47c468915ca5137ce3c2243fcea7a6dbe66fc78d
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: Iff102d5d44046659da3ebe0b13b7f3390f056bcc Change-Id: Id7ed53db36cdb9e96c352253ca5c05cc193bb90b
2020-04-28Merge "Remove MODULE_LICENSE_APACHE2 from UserDictionaryProvider" am: ↵Treehugger Robot
e4285b0992 am: 8463287886 am: c1541edc08 am: 766f3fab08 am: 8eb642ba1f Change-Id: I13b223c1956627159df7b2273a2eefad94e780a2
2020-04-28Merge "Remove MODULE_LICENSE_APACHE2 from UserDictionaryProvider" am: ↵Treehugger Robot
e4285b0992 am: 8463287886 am: c1541edc08 am: 766f3fab08 Change-Id: Ia1a0c8447b704bd7cd24c8dcd29dd3395857e650
2020-04-28Merge "Remove MODULE_LICENSE_APACHE2 from UserDictionaryProvider" am: ↵Treehugger Robot
e4285b0992 am: 8463287886 am: c1541edc08 Change-Id: I25d173f4757e675caf00abd3eae2984e988e8ed4
2020-04-28Merge "Remove MODULE_LICENSE_APACHE2 from UserDictionaryProvider" am: ↵Treehugger Robot
e4285b0992 am: 8463287886 Change-Id: Iff102d5d44046659da3ebe0b13b7f3390f056bcc
2020-04-28Merge "Remove MODULE_LICENSE_APACHE2 from UserDictionaryProvider" am: e4285b0992android-r-beta-3android-r-beta-2Treehugger Robot
Change-Id: I30b6870041a194465b8769d3af064b0d4ae56f42
2020-04-28Merge "Remove MODULE_LICENSE_APACHE2 from UserDictionaryProvider"Treehugger Robot
2020-04-27Remove MODULE_LICENSE_APACHE2 from UserDictionaryProviderBob Badour
Repositories containing third-party code need a METADATA and a license_type. Repositories containing only first-party code no longer need a MODULE_LICENSE_* file. Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I8ef452dd54a6d8bff670793dbe9c83ac36c5a74a
2019-12-04Merge "Merge Android10 QPR1 into AOSP master" am: 4848226fab am: 2150129abar_aml_301500702android-mainline-12.0.0_r55android-mainline-12.0.0_r112android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseandroid11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseaml_tz2_305400100Automerger Merge Worker
Change-Id: Ic44693dc150c2a85a7a5b1902ac2ce8916fabdc2
2019-12-04Merge "Merge Android10 QPR1 into AOSP master" am: 4848226fabandroid-r-preview-4android-r-preview-3android-r-preview-2Xin Li
am: 06055db0e8 Change-Id: Ia9e8e516ba0e56e6ea55d97ff0322f571b453ca1
2019-12-03Merge "Merge Android10 QPR1 into AOSP master"Xin Li
am: 4848226fab Change-Id: I0713698648bc1f742bf39cec41fa707d9b3c2170
2019-12-03Merge "Merge Android10 QPR1 into AOSP master"android-r-preview-1Treehugger Robot
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 20:20:17 +0000