summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-01-25Merge "Exit early if ensureCapacity is unable to allocate the required ↵android-u-beta-1-gplMythri Alle
capacity" am: 6e03829810 Original change: https://android-review.googlesource.com/c/platform/dalvik/+/2398882 Change-Id: Iaff7e84d3912269fa520b6f62485c4327025ce71 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-25Merge "Exit early if ensureCapacity is unable to allocate the required capacity"Mythri Alle
2023-01-25Exit early if ensureCapacity is unable to allocate the required capacityMythri Alle
ensureCapacity used to return -1 when the allocation failed for the requested capacity. The callers weren't checking for the return value and continued using the buffer assuming the request was successful. Since there is no way to recover from this error just exit early in ensureCapacity. Bug: 261385338 Change-Id: I75f4503ae42e6f03f8cfebb1fd3c8ee6c873c5b6
2022-12-19Merge "Snap for 9419863 from 76cdbd342102dcada250884df5f8c93a45a46608 to ↵Android Build Coastguard Worker
build-tools-release" into build-tools-release
2022-12-19Snap for 9419863 from 76cdbd342102dcada250884df5f8c93a45a46608 to ↵Android Build Coastguard Worker
build-tools-release Change-Id: I78f8e855c532a26af42ae7a9c65aff8fbb4b1675
2022-10-31Merge "Snap for 9239472 from 3818a819a3d4541564081fff98b3d3c095dece91 to ↵Android Build Coastguard Worker
build-tools-release" into build-tools-release
2022-10-31Snap for 9239472 from 3818a819a3d4541564081fff98b3d3c095dece91 to ↵Android Build Coastguard Worker
build-tools-release Change-Id: I15dcff3bd4ff4050473b91317e08e3c3289c35d9
2022-10-17Merge "Fix errorprone warnings that should be errors" am: 3818a819a3 am: ↵Treehugger Robot
76cdbd3421 am: 0951bf1b81 Original change: https://android-review.googlesource.com/c/platform/dalvik/+/2255382 Change-Id: I5aea3b0f2ad3ed0fc0e548e88e1cb68f9f7bfe75 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-17Merge "Fix errorprone warnings that should be errors" am: 3818a819a3 am: ↵Treehugger Robot
76cdbd3421 Original change: https://android-review.googlesource.com/c/platform/dalvik/+/2255382 Change-Id: I8c604b4b1d56541affe17ffd1835bea579b90f4c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-17Merge "Fix errorprone warnings that should be errors" am: 3818a819a3main-16k-with-phonesTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/dalvik/+/2255382 Change-Id: I6d79560a5d35c94d547c3924005267fbc4aa57d0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-17Merge "Fix errorprone warnings that should be errors"Treehugger Robot
2022-10-16Fix errorprone warnings that should be errorsCole Faust
This commit is part of a large scale change to fix errorprone errors that have been downgraded to warnings in the android source tree, so that they can be promoted to errors again. The full list of changes include the following, but not all will be present in any one individual commit: BadAnnotationImplementation BadShiftAmount BanJNDI BoxedPrimitiveEquality ComparableType ComplexBooleanConstant CollectionToArraySafeParameter ConditionalExpressionNumericPromotion DangerousLiteralNull DoubleBraceInitialization DurationFrom DurationTemporalUnit EmptyTopLevelDeclaration EqualsNull EqualsReference FormatString FromTemporalAccessor GetClassOnAnnotation GetClassOnClass HashtableContains IdentityBinaryExpression IdentityHashMapBoxing InstantTemporalUnit InvalidTimeZoneID InvalidZoneId IsInstanceIncompatibleType JUnitParameterMethodNotFound LockOnBoxedPrimitive MathRoundIntLong MislabeledAndroidString MisusedDayOfYear MissingSuperCall MisusedWeekYear ModifyingCollectionWithItself NoCanIgnoreReturnValueOnClasses NonRuntimeAnnotation NullableOnContainingClass NullTernary OverridesJavaxInjectableMethod ParcelableCreator PeriodFrom PreconditionsInvalidPlaceholder ProtoBuilderReturnValueIgnored ProtoFieldNullComparison RandomModInteger RectIntersectReturnValueIgnored ReturnValueIgnored SelfAssignment SelfComparison SelfEquals SizeGreaterThanOrEqualsZero StringBuilderInitWithChar TreeToString TryFailThrowable UnnecessaryCheckNotNull UnusedCollectionModifiedInPlace XorPower See https://errorprone.info/bugpatterns for more information on the checks. Bug: 253827323 Test: m RUN_ERROR_PRONE=true javac-check Change-Id: Ibf99a434679d7dcf3409c6556cc740f768809800
2022-08-17Merge "Snap for 8960563 from 90198b99b83ac24023b63f7a14610315737d3698 to ↵Android Build Coastguard Worker
build-tools-release" into build-tools-release
2022-08-17Snap for 8960563 from 90198b99b83ac24023b63f7a14610315737d3698 to ↵Android Build Coastguard Worker
build-tools-release Change-Id: I10d79349a7618ffb3405be7cedc9b6d2b50e9549
2022-06-27Merge "Snap for 8773545 from f95cfdb1df5dd7564d4b07282fac34225da058f3 to ↵Android Build Coastguard Worker
build-tools-release" into build-tools-release
2022-06-27Snap for 8773545 from f95cfdb1df5dd7564d4b07282fac34225da058f3 to ↵Android Build Coastguard Worker
build-tools-release Change-Id: I38966f35023b3dac23d2172ec84bf1eb4ad51d2f
2022-06-06Merge "Snap for 8687077 from 5a81c499a569731e2395f7c8d13c0e0d4e17a2b6 to ↵Android Build Coastguard Worker
build-tools-release" into build-tools-release
2022-06-06Snap for 8687077 from 5a81c499a569731e2395f7c8d13c0e0d4e17a2b6 to ↵Android Build Coastguard Worker
build-tools-release Change-Id: Ia351772571be269ad7fec6a5d03941bea154b323
2022-05-19Merge "Silence a compiler warning about an unused variable in `hprof-conv`." ↵Roland Levillain
am: 5a81c499a5 am: f95cfdb1df am: 90198b99b8 am: a2e756fe38 am: 9f25a79f05 Original change: https://android-review.googlesource.com/c/platform/dalvik/+/2101215 Change-Id: I59f2d4e9c3d3cc8b68674babba50c0f55d6eef8d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19Merge "Silence a compiler warning about an unused variable in `hprof-conv`." ↵Roland Levillain
am: 5a81c499a5 am: f95cfdb1df am: 90198b99b8 am: a2e756fe38 Original change: https://android-review.googlesource.com/c/platform/dalvik/+/2101215 Change-Id: Ibc6bec7354ce9a4fb1410496d0dd6c118e149ae0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19Merge "Silence a compiler warning about an unused variable in `hprof-conv`." ↵Roland Levillain
am: 5a81c499a5 am: f95cfdb1df am: 90198b99b8 Original change: https://android-review.googlesource.com/c/platform/dalvik/+/2101215 Change-Id: Ia75d0a97875eafbe67a7f1cd92ba76f45c734e80 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19Merge "Silence a compiler warning about an unused variable in `hprof-conv`." ↵Roland Levillain
am: 5a81c499a5 am: f95cfdb1df Original change: https://android-review.googlesource.com/c/platform/dalvik/+/2101215 Change-Id: I81ca0154f03e845eb87864f7b842f941a2930923 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19Merge "Silence a compiler warning about an unused variable in `hprof-conv`." ↵Roland Levillain
am: 5a81c499a5 Original change: https://android-review.googlesource.com/c/platform/dalvik/+/2101215 Change-Id: Ice9539df336b5ba05fff1269fe66c5b379420579 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19Merge "Silence a compiler warning about an unused variable in `hprof-conv`."Roland Levillain
2022-05-18Silence a compiler warning about an unused variable in `hprof-conv`.Roland Levillain
Test: mmm dalvik Change-Id: Ib7c40d354ce81bb1b57f0d08e76437c41d59c495
2022-03-09Merge "Snap for 8276530 from def0fd4b34fcca2c7e8bec79522d36cc3be5b422 to ↵Android Build Coastguard Worker
build-tools-release" into build-tools-release
2022-03-09Snap for 8276530 from def0fd4b34fcca2c7e8bec79522d36cc3be5b422 to ↵Android Build Coastguard Worker
build-tools-release Change-Id: Icb97615b6f7d6461b716b96671abf982c701c261
2022-03-02Merge "Snap for 8243001 from c8f2e4d20b6d06d3e49c2601e0a336d9c0a2beeb to ↵Android Build Coastguard Worker
build-tools-release" into build-tools-release
2022-03-02Snap for 8243001 from c8f2e4d20b6d06d3e49c2601e0a336d9c0a2beeb to ↵Android Build Coastguard Worker
build-tools-release Change-Id: I5abd58979313902a2b1704b229b40dc8134d9315
2022-02-25Merge "Remove trailing whitespace in dexdump golden output." am: c8f2e4d20b ↵Treehugger Robot
am: def0fd4b34 am: a91c5e462c am: 090cb5952b am: 8fc23049b2 Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1999014 Change-Id: I5d6c0e1cca7e14b2fe8c86698d44d0e150341963
2022-02-25Merge "Remove trailing whitespace in dexdump golden output." am: c8f2e4d20b ↵aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_ase_331311020aml_ase_331112000aml_ase_331011020android13-mainline-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-appsearch-releaseaml_tz4_332714010Treehugger Robot
am: def0fd4b34 am: a91c5e462c am: 090cb5952b Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1999014 Change-Id: Ide5b543d6531ed0b2d11736e77664ff3f3963049
2022-02-25Merge "Remove trailing whitespace in dexdump golden output." am: c8f2e4d20b ↵Treehugger Robot
am: def0fd4b34 am: a91c5e462c am: 090cb5952b Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1999014 Change-Id: I8dbdb3dc631bcbd27de3892fe3e2fc7d2346b74e
2022-02-25Merge "Remove trailing whitespace in dexdump golden output." am: c8f2e4d20b ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r55android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16aml_go_odp_330912000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000android13-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-releaseandroid13-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-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-releaseandroid13-mainline-go-adservices-releaseandroid13-frc-odp-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseTreehugger Robot
am: def0fd4b34 am: a91c5e462c Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1999014 Change-Id: I52d5bec70a17f053214563b8f0e2ff36e3fb5c1c
2022-02-25Merge "Remove trailing whitespace in dexdump golden output." am: c8f2e4d20b ↵Treehugger Robot
am: def0fd4b34 Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1999014 Change-Id: I4cae650637380812ffb068322312f77edcdc9e63
2022-02-25Merge "Remove trailing whitespace in dexdump golden output." am: c8f2e4d20bTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1999014 Change-Id: I20cae4c45f74d4d3888a0f6e36e2c48badff6638
2022-02-25Merge "Remove trailing whitespace in dexdump golden output."Treehugger Robot
2022-02-25Remove trailing whitespace in dexdump golden output.Martin Stjernholm
To make 137-dexmerger-dex38 pass after https://r.android.com/2000711. Test: m dexdump-host dalvik/dx/tests/run-test 137-dexmerger-dex38 Bug: 221424738 Change-Id: Ie1f8d691e6bdb71437e2c1643e2fb1995e652d56
2022-02-11[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8084891 am: 0098fb02bd -s ours am: 92d42df158 -s ours am skip reason: Merged-In I00d0a613a8a906ca90bb20d0bef553d4beb64373 with SHA-1 3d6710c5e3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/dalvik/+/16843643 Change-Id: Ide529bc7832d5bdd86c8eddd0af075d1ec88c652
2022-02-11[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8084891 am: 0098fb02bd -s ours am skip reason: Merged-In I00d0a613a8a906ca90bb20d0bef553d4beb64373 with SHA-1 3d6710c5e3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/dalvik/+/16843643 Change-Id: Iaed5274bb86d8d003018f81759bdfa085c11d0dc
2022-02-11Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891Xin Li
Bug: 214455710 Merged-In: I00d0a613a8a906ca90bb20d0bef553d4beb64373 Change-Id: I2699d232cbba93d256a04cb8773bfc42fcbbe496
2022-02-04Merge "Snap for 8147747 from 373c201450bbdc57fd72e37cac07720eeea4531c to ↵Android Build Coastguard Worker
build-tools-release" into build-tools-release
2022-02-04Snap for 8147747 from 373c201450bbdc57fd72e37cac07720eeea4531c to ↵Android Build Coastguard Worker
build-tools-release Change-Id: Ie64aa3d0834a33b9f6a95cdcda861b468dd924fa
2022-01-25Merge "Run dx tests with Java 11 by default" am: 373c201450 am: 0101247b92 ↵Orion Hodson
am: 3e46f0239f am: 266363dee4 Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1959189 Change-Id: Ibc56bfe0e6aa2bfd6a040a294be5b148bd7d0c7f
2022-01-25Merge "Run dx tests with Java 11 by default" am: 373c201450 am: 0101247b92 ↵Orion Hodson
am: 3e46f0239f Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1959189 Change-Id: I4ed001ec4e5475cd17fb99569fa1761896d6b205
2022-01-25Merge "Run dx tests with Java 11 by default" am: 373c201450 am: 0101247b92Orion Hodson
Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1959189 Change-Id: Id978b3fede36bbd915a0d2af29ac9dcfa7a2a41b
2022-01-25Merge "Run dx tests with Java 11 by default" am: 373c201450Orion Hodson
Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1959189 Change-Id: Iab55f209f472dbdd0ae16fe170499bd21f75f725
2022-01-25Merge "Run dx tests with Java 11 by default"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-1Orion Hodson
2022-01-25Run dx tests with Java 11 by defaultSorin Basca
Test: cd dalvik && mma && dx/tests/run-all-tests Change-Id: I8c3c560e704ae700e22091b2cbcb2617123584cd
2022-01-20Merge "dx-tests: fixes and suppressions following java 11 switch" am: ↵Orion Hodson
06ee287673 am: 4038b63464 am: 3a1bbea144 am: abc69c7426 Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1956098 Change-Id: I730f91351f5e661d1e919cb149f9b76d8f9e031e
2022-01-20Merge "dx-tests: fixes and suppressions following java 11 switch" am: ↵Orion Hodson
06ee287673 am: 4038b63464 am: 3a1bbea144 Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1956098 Change-Id: I548f60f07febdb61a5b86aa4e8b1634e8abb2a1f