summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 57a5ad2e6b -s ↵android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-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_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-releaseXin Li
ours am: 411b9bacb9 -s ours am skip reason: Change-Id I34aab72dc94ef82be99b3665e792d9eee2a3fc73 with SHA-1 008ae5c017 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I20c2646b9c6756f2c18769ddcb4b765f1a5f9d9e
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 57a5ad2e6b -s oursXin Li
am skip reason: Change-Id I34aab72dc94ef82be99b3665e792d9eee2a3fc73 with SHA-1 008ae5c017 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I92692f80a47c9803be68503cbed28be209ac0e26
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-2android-s-beta-1Xin Li
Bug: 180401296 Merged-In: I34aab72dc94ef82be99b3665e792d9eee2a3fc73 Change-Id: Ia8d56d97c8c56c60694989c8c1300720cf4a2bb3
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/error_prone am: cbe9826c90 am: ↵Bob Badour
209328b5c7 am: f065787894 Original change: https://android-review.googlesource.com/c/platform/external/error_prone/+/1588952 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia628ca6b738b12977e26450e78cd56ffd3536b93
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/error_prone am: cbe9826c90 am: ↵Bob Badour
209328b5c7 Original change: https://android-review.googlesource.com/c/platform/external/error_prone/+/1588952 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I18da60e924520976b0ce806d3fc6e1cdaa2a207d
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/error_prone am: cbe9826c90Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/error_prone/+/1588952 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I36751146ba7ad41e6b2171ca5a677df7cef842e1
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/error_proneandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 to: jimfs/Android.bp soong/Android.bp Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-CPL-1.0 SPDX-license-identifier-EPL SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-LGPL SPDX-license-identifier-MIT to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I5a2ecc7073901257948bf7bdf4f3aa4faee9d875
2021-01-19Revert^4 "Upgrade error_prone annotations to 2.4.0" am: 64eac7aeab am: ↵Haibo Huang
a763168dde am: 6431b1b460 Original change: https://android-review.googlesource.com/c/platform/external/error_prone/+/1552605 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If5f16650f3bf90d5f5c03e561efff82f7a965f38
2021-01-19Revert^4 "Upgrade error_prone annotations to 2.4.0" am: 64eac7aeab am: ↵Haibo Huang
a763168dde Original change: https://android-review.googlesource.com/c/platform/external/error_prone/+/1552605 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1ea0752ad06f3773c110cdcafa73a67b3e2a651f
2021-01-19Revert^4 "Upgrade error_prone annotations to 2.4.0" am: 64eac7aeabHaibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/error_prone/+/1552605 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5aa65cb5687eae6c8685005abdffb17a7390c170
2021-01-15Revert^4 "Upgrade error_prone annotations to 2.4.0"Haibo Huang
Fix cherry picked in ag/13351283 23331c8ff159be7fb0c208860f5df5839f28795c Change-Id: I44fce81eddfeb254706d08b949735f8b7a6e75f1
2021-01-14Revert^3 "Upgrade error_prone annotations to 2.4.0" am: 23331c8ff1 am: ↵Chang Li
eabfa662b7 am: fbd565be7c Original change: https://android-review.googlesource.com/c/platform/external/error_prone/+/1549685 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0ce498ca31b8b65f2fac838ae3e88c0632d86259
2021-01-14Revert^3 "Upgrade error_prone annotations to 2.4.0" am: 23331c8ff1 am: ↵Chang Li
eabfa662b7 Original change: https://android-review.googlesource.com/c/platform/external/error_prone/+/1549685 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1247973b2dcfa1bc59817c8d9d66d2d481ba72e5
2021-01-13Revert^3 "Upgrade error_prone annotations to 2.4.0" am: 23331c8ff1Chang Li
Original change: https://android-review.googlesource.com/c/platform/external/error_prone/+/1549685 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I792b7a91fb768f6aeac0408c93681d544b950fb8
2021-01-13Revert^3 "Upgrade error_prone annotations to 2.4.0"Chang Li
02bcbbe27691b9767628337b4880c7143dd8552c Change-Id: I5a56f5a6a56c6d41f3b7a5a34970c6a1ce99fd93
2021-01-13Revert^2 "Upgrade error_prone annotations to 2.4.0" am: 02bcbbe276 am: ↵Chang Li
6e96e21928 am: 1847424a1d Original change: https://android-review.googlesource.com/c/platform/external/error_prone/+/1539393 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia03079e76d2a9c4aa9dac6758211dac78e2dabe4
2021-01-13Revert^2 "Upgrade error_prone annotations to 2.4.0" am: 02bcbbe276 am: ↵Chang Li
6e96e21928 Original change: https://android-review.googlesource.com/c/platform/external/error_prone/+/1539393 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idba59cb052d6f78c9303ec0c972ce4313b6d0bb0
2021-01-13Revert^2 "Upgrade error_prone annotations to 2.4.0" am: 02bcbbe276Chang Li
Original change: https://android-review.googlesource.com/c/platform/external/error_prone/+/1539393 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8d7162326efee4931cdcaa7467eebeb593a4e220
2021-01-06Revert^2 "Upgrade error_prone annotations to 2.4.0"Chang Li
a75d7c65a96c3f7de2f9ec9a72c064e84e41d750 Change-Id: I943a7b168c28d9e9c7eb915a46950f7dd0346f50
2020-11-24Mark ab/6881855 as merged am: cc7a29e25f am: 008ae5c017Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/error_prone/+/13112601 Change-Id: Ia5ef6d8653fc996096e32fd7a0fb909d85e71691
2020-11-24Mark ab/6881855 as merged am: cc7a29e25fXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/error_prone/+/13112601 Change-Id: I34aab72dc94ef82be99b3665e792d9eee2a3fc73
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I4b2e2ec2a3b72ac22464997cf373b26cc788d31e
2020-11-14Revert "Upgrade error_prone annotations to 2.4.0" am: a75d7c65a9 am: ↵Haibo Huang
84ed2b5242 am: c659f96562 am: b44be4bc6a Original change: https://android-review.googlesource.com/c/platform/external/error_prone/+/1498255 Change-Id: I33b7a587e471827eaa42e58318c5447855e8e10d
2020-11-14Revert "Upgrade error_prone annotations to 2.4.0" am: a75d7c65a9 am: ↵Haibo Huang
84ed2b5242 am: c659f96562 Original change: https://android-review.googlesource.com/c/platform/external/error_prone/+/1498255 Change-Id: I0f396de6df48480f666de6485d912620ed361d33
2020-11-14Revert "Upgrade error_prone annotations to 2.4.0" am: a75d7c65a9 am: 84ed2b5242Haibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/error_prone/+/1498255 Change-Id: I9a5e8c7052f3640237813d870142f401ee94503f
2020-11-14Revert "Upgrade error_prone annotations to 2.4.0" am: a75d7c65a9Haibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/error_prone/+/1498255 Change-Id: I358d55bff64235a4eec7fb4e92692dee5892d3d3
2020-11-13Revert "Upgrade error_prone annotations to 2.4.0"Haibo Huang
Revert submission 1472525-guava Reason for revert: b/173193638 Reverted Changes: I08f24c514:Upgrade error_prone annotations to 2.4.0 I4077b6ae3:Upgrade guava to v30.0 Exempt-From-Owner-Approval: revert Change-Id: I1177314ee1e0d175cf16f80cf80321a65df5e0dc
2020-11-12Upgrade error_prone annotations to 2.4.0 am: 8136741536 am: 889c5f80ec am: ↵Haibo Huang
24dcd247c5 am: 7e78a0cd58 Original change: https://android-review.googlesource.com/c/platform/external/error_prone/+/1472525 Change-Id: I4f2fe4f482473abe3347b19d9d42510f2b9bd6bc
2020-11-12Upgrade error_prone annotations to 2.4.0 am: 8136741536 am: 889c5f80ec am: ↵Haibo Huang
24dcd247c5 Original change: https://android-review.googlesource.com/c/platform/external/error_prone/+/1472525 Change-Id: I27a139be1b18e0acdbd4690fff622d5792a1be79
2020-11-12Upgrade error_prone annotations to 2.4.0 am: 8136741536 am: 889c5f80ecHaibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/error_prone/+/1472525 Change-Id: Id81ffa16bb628aa7887b293bfa7aeb7506f889b1
2020-11-12Upgrade error_prone annotations to 2.4.0 am: 8136741536Haibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/error_prone/+/1472525 Change-Id: I6b9d1e84404f036b364131392f4a4aebdafeaa82
2020-11-06Upgrade error_prone annotations to 2.4.0Haibo Huang
`./update.sh 2.4.0 9+181-r4173-1` and fix Android.bp. Implementation jars are reverted back to 2.3.2 because they have some dependencies missing in AOSP. Test: build Change-Id: I08f24c5146cf86d85bffe891d4373e921f728aa9
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: b3b86256b7 -s ours am: ↵Xin Li
56570ce481 -s ours am: 1ea0c6aa2c -s ours am skip reason: Change-Id I226625a330c0f80490efba2e3477db45df88a0d6 with SHA-1 fa6eec18ef is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/error_prone/+/12797238 Change-Id: I700889c4592c59e43267ce7c2f1808ba929d52cc
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: b3b86256b7 -s ours am: ↵Xin Li
56570ce481 -s ours am skip reason: Change-Id I226625a330c0f80490efba2e3477db45df88a0d6 with SHA-1 fa6eec18ef is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/error_prone/+/12797238 Change-Id: I252630854b30bf02ffdaff28fd0b18923f18faa0
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: b3b86256b7 -s oursXin Li
am skip reason: Change-Id I226625a330c0f80490efba2e3477db45df88a0d6 with SHA-1 fa6eec18ef is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/error_prone/+/12797238 Change-Id: I857e4d12554fd093286a4fbf02b9f8a83311b4b9
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I226625a330c0f80490efba2e3477db45df88a0d6 Change-Id: I09c4613fa124560e1226db1bb0abdcbf6e75cdf6
2020-10-06Globally disable extremely noisy Error Prone. am: 7a5299fb43 am: 3ccf4f0fe0 ↵Jeff Sharkey
am: bba7bb7ce0 am: 9336696dbc Original change: https://android-review.googlesource.com/c/platform/external/error_prone/+/1449777 Change-Id: I68a0b032c9644a8604d0f7c4c01592f6b7880f35
2020-10-06Globally disable extremely noisy Error Prone. am: 7a5299fb43 am: 3ccf4f0fe0 ↵Jeff Sharkey
am: bba7bb7ce0 Original change: https://android-review.googlesource.com/c/platform/external/error_prone/+/1449777 Change-Id: I0397606fcfaa5a20511703000a7d29ce87a50570
2020-10-06Globally disable extremely noisy Error Prone. am: 7a5299fb43 am: 3ccf4f0fe0Jeff Sharkey
Original change: https://android-review.googlesource.com/c/platform/external/error_prone/+/1449777 Change-Id: Ib8295682f3560c9642fcdc9a21a1fe85966e364b
2020-10-06Globally disable extremely noisy Error Prone. am: 7a5299fb43Jeff Sharkey
Original change: https://android-review.googlesource.com/c/platform/external/error_prone/+/1449777 Change-Id: Ie5b82845861cd91137adf5ddd8d5094b91ca3a76
2020-10-05Globally disable extremely noisy Error Prone.Jeff Sharkey
We noticed that of the 155240 warnings found, 73835+22742 (or about 62% of them) are coming from these two warnings: * MissingOverride * UnnecessaryParentheses Since these aren't actually causing harm, they're mostly just causing the build server to collect a bunch of unactionable noise, so I'd like to proposal globally disabling those two warnings. Bug: 170172949 Test: manual Change-Id: I453b12441f3b02b3854569bd032b6194265fbf6b
2020-04-30Add METADATA to error_prone: contains GPL+LGPL=RESTRICTED am: 397d0d8c94 am: ↵Bob Badour
9bfe7c610d am: 423927a820 am: fa6eec18ef am: 0da0f480af Change-Id: I1a3213a04556dfc448071b329d6ca730697ea5b5
2020-04-30Add METADATA to error_prone: contains GPL+LGPL=RESTRICTED am: 397d0d8c94 am: ↵Bob Badour
9bfe7c610d am: 423927a820 am: fa6eec18ef Change-Id: Ida3dc70c0d1327d53b6657382d8ea29d3c176422
2020-04-30Add METADATA to error_prone: contains GPL+LGPL=RESTRICTED am: 397d0d8c94 am: ↵Bob Badour
9bfe7c610d am: 423927a820 Change-Id: I226625a330c0f80490efba2e3477db45df88a0d6
2020-04-30Add METADATA to error_prone: contains GPL+LGPL=RESTRICTED am: 397d0d8c94 am: ↵Bob Badour
9bfe7c610d Change-Id: Ie72dd9eab142bab35c7432376b6c98a74630df22
2020-04-30Add METADATA to error_prone: contains GPL+LGPL=RESTRICTED am: 397d0d8c94android-r-beta-3android-r-beta-2Bob Badour
Change-Id: Id7db2a12c8b89567dc865460e8219fa14337f1e5
2020-04-29Add METADATA to error_prone: contains GPL+LGPL=RESTRICTEDBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: Ie71b429b02cd3e644c4ae9d1521c8640123e7ca7
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: d08741e75c -s ours am: bcfe2b7d26 am: c944c8e1ee am: 04a2ae4e33 -s ours am skip reason: subject contains skip directive Change-Id: Iabb859823b8b7c498104d831e670b1e01554cbd3
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: d08741e75c -s ours am: bcfe2b7d26 am: c944c8e1ee Change-Id: I47cad7345b87ba92731c52db0eb8a56caac57e5b
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: d08741e75c -s ours am: bcfe2b7d26 Change-Id: If1a122a2e8776ae49cb1393edf7e699b031ddbf3
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 00:49:08 +0000