summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-01-12Merge "Support v41 DEX version for dexdeps." into main am: 1bed4bab8b am: ↵HEADmastermainKeyi Gui
e5ed58210b am: f075e91770 Original change: https://android-review.googlesource.com/c/platform/dalvik/+/2902247 Change-Id: Ic1807a823e240e4a5e01cca6e8758d5441926a8e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-12Merge "Support v41 DEX version for dexdeps." into main am: 1bed4bab8b am: ↵Keyi Gui
e5ed58210b Original change: https://android-review.googlesource.com/c/platform/dalvik/+/2902247 Change-Id: I046840b283d459b5fab68ffe3bb4f1e7fb70d5ed Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-12Merge "Support v41 DEX version for dexdeps." into main am: 1bed4bab8bKeyi Gui
Original change: https://android-review.googlesource.com/c/platform/dalvik/+/2902247 Change-Id: Icd03a7a9c6ef892d101b42981590b507ac9faa0b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-12Merge "Support v41 DEX version for dexdeps." into mainKeyi Gui
2024-01-09Support v41 DEX version for dexdeps.kgui
In Android 15 most CTS APKs will be upgraded to using DEX v41 in classes.dex. Bug: 319178625 Test: locally on an APK built internally Change-Id: Ia1346aab3f7d4552c4a3289b5df4161c6f0686c0
2024-01-03Merge "Update `OWNERS` files under `dalvik`." into main am: bd9032155f am: ↵Roland Levillain
5a6c67fad8 am: 467e199ca7 Original change: https://android-review.googlesource.com/c/platform/dalvik/+/2893244 Change-Id: I8312c13dbf240bbad6100f095c8b4876c86032c5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03Merge "Update `OWNERS` files under `dalvik`." into main am: bd9032155f am: ↵Roland Levillain
5a6c67fad8 Original change: https://android-review.googlesource.com/c/platform/dalvik/+/2893244 Change-Id: I9d0964ba56ab27385be20a40bc51b9b5c920a3b1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03Merge "Update `OWNERS` files under `dalvik`." into main am: bd9032155fRoland Levillain
Original change: https://android-review.googlesource.com/c/platform/dalvik/+/2893244 Change-Id: Ib06565e48ca39dbae9580df7feb23c21a8a42d43 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03Merge "Update `OWNERS` files under `dalvik`." into mainRoland Levillain
2024-01-02Update `OWNERS` files under `dalvik`.Roland Levillain
Test: n/a Change-Id: Icf86249dfc5e9098e968f1ef70fe0ad4416cae4d
2023-09-07[automerger skipped] Remove unused dx-doc-stubs am: f7a6e166d2 -s oursPaul Duffin
am skip reason: Merged-In I22c96d8f4d6a4f0036c9d0ce45825df7e585edb5 with SHA-1 3eb1e697a5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/dalvik/+/24692287 Change-Id: If7726fad7cbda7b090c79c8c020235f0a98d9be3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07Remove unused dx-doc-stubsPaul Duffin
Bug: 287241408 Bug: 299122345 Test: TH (cherry picked from https://android-review.googlesource.com/q/commit:3eb1e697a548d5b4c38d82dac9d142b0637a840d) Merged-In: I22c96d8f4d6a4f0036c9d0ce45825df7e585edb5 Change-Id: I22c96d8f4d6a4f0036c9d0ce45825df7e585edb5
2023-08-04Merge "Remove references to the pdk product variable" into main am: ↵Treehugger Robot
e6ca015645 am: bcd1192abc am: e13f95ec26 am: dfa1dd31a6 am: f001dfd9f3 Original change: https://android-review.googlesource.com/c/platform/dalvik/+/2693367 Change-Id: I1d8b4ecaeec4111b9e049a04928bcd7f9464b680 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-04Merge "Remove references to the pdk product variable" into main am: ↵Treehugger Robot
e6ca015645 am: bcd1192abc am: e13f95ec26 am: dfa1dd31a6 Original change: https://android-review.googlesource.com/c/platform/dalvik/+/2693367 Change-Id: Iab9f08b6f599847e9a29d34636a807dca39449d7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-04Merge "Remove references to the pdk product variable" into main am: ↵Treehugger Robot
e6ca015645 am: bcd1192abc am: e13f95ec26 Original change: https://android-review.googlesource.com/c/platform/dalvik/+/2693367 Change-Id: I4034c9359b73a543b2e75d7c79090f448ed40e9f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-04Merge "Remove references to the pdk product variable" into main am: ↵Treehugger Robot
e6ca015645 am: bcd1192abc Original change: https://android-review.googlesource.com/c/platform/dalvik/+/2693367 Change-Id: Iec7a1aa6765def7e8f0dd306a328433029370f0e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-04Merge "Remove references to the pdk product variable" into main am: e6ca015645Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/dalvik/+/2693367 Change-Id: Ifd5429c10a37a2f53b09e3bb4d8fd79c110d0d2d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-04Merge "Remove references to the pdk product variable" into mainTreehugger Robot
2023-08-03Remove references to the pdk product variableCole Faust
pdk is deprecated and has no effect as of aosp/1319667. Test: Presubmits Change-Id: I52abb6188b677cd8bc79a72f5b4b1638fbc7cb18
2023-07-15[automerger skipped] Empty Merge Android U (ab/10368041) am: 182dae7044 -s ↵Xin Li
ours am: 17e55115d6 -s ours am: a34c718e1e -s ours am: 645c40f0b7 -s ours am skip reason: Merged-In Ic263f7f0477e0bbd53d7e07bf09af430365880ee with SHA-1 b6b1b529e5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/dalvik/+/24087825 Change-Id: I831bb58c4fbf9c2ac59c4acc6484b6243ffd6b25 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-15[automerger skipped] Empty Merge Android U (ab/10368041) am: 182dae7044 -s ↵Xin Li
ours am: 17e55115d6 -s ours am: a34c718e1e -s ours am skip reason: Merged-In Ic263f7f0477e0bbd53d7e07bf09af430365880ee with SHA-1 b6b1b529e5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/dalvik/+/24087825 Change-Id: Id81bab27e487aa3738a78a86420af001dda6639c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-15[automerger skipped] Empty Merge Android U (ab/10368041) am: 182dae7044 -s ↵Xin Li
ours am: 17e55115d6 -s ours am skip reason: Merged-In Ic263f7f0477e0bbd53d7e07bf09af430365880ee with SHA-1 b6b1b529e5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/dalvik/+/24087825 Change-Id: If1ec529db7d76b5c9599a14026601bf7cdb2bd71 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-15[automerger skipped] Empty Merge Android U (ab/10368041) am: 182dae7044 -s oursXin Li
am skip reason: Merged-In Ic263f7f0477e0bbd53d7e07bf09af430365880ee with SHA-1 b6b1b529e5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/dalvik/+/24087825 Change-Id: I2ccd86476fa87966292b2f4cc62765ca56e2c1fe Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14Empty Merge Android U (ab/10368041)Xin Li
Bug: 291102124 Merged-In: Ic263f7f0477e0bbd53d7e07bf09af430365880ee Change-Id: Ib258155f731675de0f31e1e7289329f5dca632c0
2023-07-11Merge "Remove unused dx-doc-stubs" into main am: 2b4a033fae am: 753fc6def4 ↵Treehugger Robot
am: d3a575da7c am: 4c36c5873b am: d36507e86d am: e1b0b1db97 Original change: https://android-review.googlesource.com/c/platform/dalvik/+/2653043 Change-Id: I37b957de81acf6642e3a106c26e3370b409cf4ff Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11Merge "Remove unused dx-doc-stubs" into main am: 2b4a033fae am: 753fc6def4 ↵Treehugger Robot
am: d3a575da7c am: 4c36c5873b am: d36507e86d Original change: https://android-review.googlesource.com/c/platform/dalvik/+/2653043 Change-Id: Ic3a0eefccca5b4693cd44dbd04d174ff9ca6ed47 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11Merge "Remove unused dx-doc-stubs" into main am: 2b4a033fae am: 753fc6def4 ↵Treehugger Robot
am: d3a575da7c am: 4c36c5873b Original change: https://android-review.googlesource.com/c/platform/dalvik/+/2653043 Change-Id: I597d8f65295e92580ae4f4138789ac84b577d139 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11Merge "Remove unused dx-doc-stubs" into main am: 2b4a033fae am: 753fc6def4 ↵Treehugger Robot
am: d3a575da7c Original change: https://android-review.googlesource.com/c/platform/dalvik/+/2653043 Change-Id: I5f0b910a156ca67ed8ca94b821007a528b952463 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11Merge "Remove unused dx-doc-stubs" into main am: 2b4a033fae am: 753fc6def4Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/dalvik/+/2653043 Change-Id: Ie08ffa067f37db4e5c586cc31345d0247ec91cda Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11Merge "Remove unused dx-doc-stubs" into main am: 2b4a033faeTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/dalvik/+/2653043 Change-Id: If87d12db6bee7701438eeb71d34596500d7de277 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11Merge "Remove unused dx-doc-stubs" into mainTreehugger Robot
2023-07-11Remove unused dx-doc-stubsPaul Duffin
Bug: 287241408 Test: TH Change-Id: I22c96d8f4d6a4f0036c9d0ce45825df7e585edb5
2023-01-25Merge "Exit early if ensureCapacity is unable to allocate the required ↵android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16aml_rkp_341015010aml_rkp_341012000aml_hef_341114030android14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-devMythri Alle
capacity" am: 6e03829810 am: 0d7312c1b4 am: b9bcad53a7 Original change: https://android-review.googlesource.com/c/platform/dalvik/+/2398882 Change-Id: Ic263f7f0477e0bbd53d7e07bf09af430365880ee 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 ↵Mythri Alle
capacity" am: 6e03829810 am: 0d7312c1b4 Original change: https://android-review.googlesource.com/c/platform/dalvik/+/2398882 Change-Id: I4f0d0ccaf0855634542186d316dc3fc90a8ca2e8 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 ↵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-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-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-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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-06 09:40:56 +0000