Commit Graph

7901 Commits

Author SHA1 Message Date
Rico Wind
9db035899e Merge "Add support for DynamicRefTable when serializing/deserializing proto" 2022-11-12 13:51:24 +00:00
Iurii Makhno
a7ba6b6813 Do not validate localeConfig if it is referenced as external symbol.
Bug: b/258816606
Test: Link_test
Change-Id: I5dd4aa75c02ceebad26d025a99ba302ec673abf8
2022-11-11 18:32:13 +00:00
Rico Wind
e70bbb1ecf Add support for DynamicRefTable when serializing/deserializing proto
Test: make aapt2_tests
Bug: 239390219
Bug: 237783271
Change-Id: I768f9167117c3a85c4dcabf2ece8a31e277c1e98
2022-11-11 09:37:54 +01:00
Treehugger Robot
32dfb93e37 Merge "Use Guava built from source in tools." am: 927a9ea7b9 am: b1e981dd69 am: d4f2a8e747
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2288134

Change-Id: I03fdf5dda4d206cc597f0045f2ad7969a5410e6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-07 19:19:53 +00:00
Treehugger Robot
b1e981dd69 Merge "Use Guava built from source in tools." am: 927a9ea7b9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2288134

Change-Id: I26370d3d3156e4a98ed4dae089f00ff993fd686b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-07 18:02:40 +00:00
Krzysztof Kosiński
7bd76c43c6 Use Guava built from source in tools.
Bug: 244341573
Test: presubmit
Change-Id: I401a191b414185a299ca1f28372770ff424171c4
2022-11-04 21:40:30 +00:00
Brandon Liu
5dedf4cdef Merge "Fixing edge cases that @string references passed in path parts." 2022-11-04 18:06:01 +00:00
Brandon Liu
a35bf78caa Fixing edge cases that @string references passed in path parts.
Bug: b/241114745
Test: Added and verified affected atests pass
Change-Id: Ia7048222bf91aa3ce02e090789e9af05bbed97e1
2022-11-03 21:17:58 +00:00
Seigo Nonaka
e7e383e032 Update fontchain_linter for non-compat font
Bug: 255901351
Test: m fontchain_lint
Change-Id: If60de61504188a7222e2efa67705b8bf4400dbda
2022-10-28 11:30:37 +09:00
Brandon Liu
3cff2550ca Force path parts in intent filter with deeplinks to have leading slash.
Bug: 241114745
Test: Added and verified affected atests pass
Change-Id: I1aa5148b1b0722e9fde33be6cbb6277ebfb6e10d
2022-10-25 17:50:32 +00:00
Matt Gilbride
ab3f6695d9 Merge "Refactor ManualPermissionCheckDetector for @PermissionMethod" 2022-10-19 15:43:05 +00:00
mattgilbride
69dec36abe Refactor ManualPermissionCheckDetector for @PermissionMethod
Uses @PermissionMethod/@PermissionName annotations to find and auto-fix
"manual" permission checks that can be migrated to @EnforcePermission
(as opposed to a hard-coded list of known permission methods).

Bug: 247537842
Test: ManualPermissionCheckDetectorTest
Change-Id: Ibd842f0e64e2006954bffa24c7fe394903dd7b61
2022-10-19 13:27:23 +00:00
Iurii Makhno
f3ee72ce56 Merge "Expose flags for collapse resource name to 'convert' command." 2022-10-18 19:18:14 +00:00
Iurii Makhno
054e43317e Expose flags for collapse resource name to 'convert' command.
To achieve this ParseResourceConfig is extracted to Utils.cpp and tests
are moved from Optimize_test.cpp to Util_test.cpp.

Bug: b/249793372
Test: Util_test, Convert_test
Change-Id: I5a0458e3834d5ea62c96013abc14527285e895e0
2022-10-18 17:12:59 +00:00
Brandon Liu
8cc7952327 Merge "Sparse encoding fully drop config.sdkVersion check" 2022-10-13 16:40:46 +00:00
mattgilbride
e6e251e1a9 Update lint_fix to remove stale suggested-fixes.zip
Bug: N/A
Test: manually, TH
Change-Id: I2ed746a3a9a23f61fdb7a4b05bcc68ed7f7109c4
2022-10-12 20:27:50 +00:00
Treehugger Robot
981a832c3a Merge "Use ASM9 in tools" am: cb82e0cb3e am: 172e2c5a31 am: 17313d2dca
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2240208

Change-Id: Ibcc5dc018d59714fa30e911198ccea3a4989c8e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 09:39:47 +00:00
Treehugger Robot
172e2c5a31 Merge "Use ASM9 in tools" am: cb82e0cb3e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2240208

Change-Id: I7080fba706038a9315c98d217d47ed827ec1331d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 08:34:27 +00:00
Brandon Liu
07e272d2e4 Sparse encoding fully drop config.sdkVersion check
Bug: 197642721
Test: Updated and verified affected atests pass
Change-Id: I0e5b7086e665340cd2995c11af8b901de85d321f
2022-10-12 01:43:05 +00:00
Sorin Basca
7b15f93109 Add java exports for ImmutabilityAnnotationProcessorUnitTests
Bug: 251840211
Test: atest --host ImmutabilityProcessorTest
Change-Id: I3f83974709c84be6f927ef1e3e4a4e397846b00e
2022-10-11 21:49:43 +01:00
Xin Li
92da83812c Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9129937" into stage-aosp-master 2022-10-11 17:39:41 +00:00
Sorin Basca
6eb1ed76db Use ASM9 in tools
Bug: 233029164
Test: TH
Change-Id: I7e11e3f8ac4be1f3f506608ff15b4e1eb867d22e
2022-10-10 09:42:45 +01:00
Treehugger Robot
8fbb26bf94 Merge "Allow passing in a category override to aapt2" 2022-10-07 22:39:26 +00:00
Jeremy Meyer
ba7b2c924a Allow passing in a category override to aapt2
Bug: 240322840
Test: unit test
Change-Id: Ia605ad8ad0267b02d67da15cf65775f69aef59e5
2022-10-07 18:13:20 +00:00
Jeremy Meyer
7726cdd61c Merge "Allow passing in a category override to aapt2" 2022-10-07 17:57:16 +00:00
Hans Boehm
0ec0ceb9bb Merge "Make LoadClass collect garbage as promised" am: e16473b1da am: 87376c8b47 am: 3d794a3a66
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2150615

Change-Id: Ic1ceed65d45931640ee4c4c33d726dbc1db09290
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-07 01:20:03 +00:00
Hans Boehm
3d794a3a66 Merge "Make LoadClass collect garbage as promised" am: e16473b1da am: 87376c8b47
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2150615

Change-Id: I9ce4b3b580841daf2be9f2df8a6412049ba15c11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-07 00:47:01 +00:00
Hans Boehm
e16473b1da Merge "Make LoadClass collect garbage as promised" 2022-10-06 23:34:08 +00:00
Treehugger Robot
bd08d0e397 Merge "Fix stack-use-after-scope for a std::string" am: 165a7640cf am: 9f339eb21b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2241510

Change-Id: I736bfb19fa3035d60f41b289837597994e753706
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-06 20:09:23 +00:00
Stephen Hines
d0ac4e1a0d Fix stack-use-after-scope for a std::string
`android::util::Utf16ToUtf8()` actually returns a `std::string` due to
the actual conversion to Utf8. `ParseResourceNamedType()` operates on a
`StringPiece` of `converted` (the `std::string` returned from that
call), and stashes it away for later use. Of course, by the time we're
using the `StringPiece` in `parsed_type`, `converted` has already gone
out of scope and is invalid to access.

Bug: http://b/250827883
Test: ./art/test/testrunner/run_build_test_target.py -j80 art-asan
Merged-In: Iea71a5cc84b7dfa96e7dcb549435f8394770a4df
Change-Id: Ie03aa417c56df5cedd58bf0b32994d6b4e5395b4
2022-10-05 18:23:46 -07:00
TreeHugger Robot
16847cd736 Merge "Propagate class @Immutable.Ignore to references" 2022-10-05 18:38:12 +00:00
Iurii Makhno
0370f2aaa5 Merge changes I938a3425,Ica98a25a
* changes:
  Add deduplicate_entry_values mode to TableFlattener.
  Intoduce ResEntryWriter unit.
2022-10-05 16:30:50 +00:00
Winson Chiu
aff3d507d3 Propagate class @Immutable.Ignore to references
If a class is marked at its header with @Immutable.Ignore, the
processor should ignore all usages and references to the class,
regardless of it's used as a return type or type arg.

Without this change, it was required to mark @Ignore on all of
usages of the class.

Test: atest android.processor.ImmutabilityProcessorTest#ignoredClass

Change-Id: I5cd470d86c6eb8c3358656a6d8f6e2588bdb6c66
2022-10-05 16:27:07 +00:00
TreeHugger Robot
10bf49f4be Merge "Fix stack-use-after-scope for a std::string" 2022-10-05 14:03:05 +00:00
Iurii Makhno
8b33e7adb8 Add deduplicate_entry_values mode to TableFlattener.
This CL introduces DeduplicateItemsResEntryWriter which stores unique
pairs of entry and value and deduplicates a new pair based of this data
before writing it into the buffer.

Bug: b/249793372
Test: ResEntriesWriter_test, TableFlattener_test
Change-Id: I938a3425a87bfad9853e59193680de2050a95bd2
2022-10-05 12:31:24 +00:00
Iurii Makhno
cf844a3e8c Intoduce ResEntryWriter unit.
ResEntryWriter is responsible to write pairs of entry+value into binary
buffers and allows easy customization how and where entries are written.

This is no-op refactoring and all existing tests should pass.

Bug: b/249793372
Test: Existing tests
Change-Id: Ica98a25aeb49cc96cad28547c462b36316a8adb6
2022-10-05 00:04:31 +00:00
TreeHugger Robot
7ca7a30da2 Merge "Handle super classes for @Immutable" 2022-10-04 20:23:35 +00:00
Winson Chiu
3d7578b7dc Handle super classes for @Immutable
Also visits the interfaces and super classes for each visitClass
invocation, so that parent methods are checked for immutability.

Test: atest android.processor.ImmutabilityProcessorTest#superClass
Test: manual, verify a pending API change to AndroidPackage

Change-Id: I04dca64f070d79e382cd2a5d53221d54fc072f76
2022-10-04 18:30:55 +00:00
mattgilbride
c81285d703 Add a PermissionMethodDetector lint to enforce proper usage of the
annotation

See: go/enforcepermission-migration-design
Bug: 247537842
Test: Tested manually, ultimately will be tested in presubmit (atest
AndroidFrameworkLintCheckerTest, see TODO b/240445172)

Change-Id: I9d2c0125a3d1c22288e191b891245ca216b49112
2022-10-04 14:24:37 +00:00
Stephen Hines
eb39a51194 Fix stack-use-after-scope for a std::string
`android::util::Utf16ToUtf8()` actually returns a `std::string` due to
the actual conversion to Utf8. `ParseResourceNamedType()` operates on a
`StringPiece` of `converted` (the `std::string` returned from that
call), and stashes it away for later use. Of course, by the time we're
using the `StringPiece` in `parsed_type`, `converted` has already gone
out of scope and is invalid to access.

Bug: http://b/250827883
Test: ./art/test/testrunner/run_build_test_target.py -j80 art-asan

Change-Id: Iea71a5cc84b7dfa96e7dcb549435f8394770a4df
2022-10-04 03:08:39 -07:00
Jeremy Meyer
6b05b7d95f Allow passing in a category override to aapt2
Bug: 240322840
Test: unit test
Change-Id: Ia605ad8ad0267b02d67da15cf65775f69aef59e5
2022-09-30 22:24:25 +00:00
Treehugger Robot
3cd9198b90 Merge "Add colefaust@ and farivar@ to OWNERS" am: 05d1acf688 am: c5349cb832 am: d675cedd4d am: 6ba4b73c25 am: 30b67584b8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2238095

Change-Id: Ic23af371d7fe15cc12ada38dc48243166c896817
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-30 11:45:02 +00:00
Treehugger Robot
30b67584b8 Merge "Add colefaust@ and farivar@ to OWNERS" am: 05d1acf688 am: c5349cb832 am: d675cedd4d am: 6ba4b73c25
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2238095

Change-Id: Iec7ee018efcd8eb469415d57c545a777ee181263
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-30 10:21:08 +00:00
Yurii Zubrytskyi
1fc44ebb01 Clean up some resources code
More moves and fewer allocations

Bug: 237583012
Test: unit tests
Change-Id: I5cf43c8af0743c0e4d96808f1e55ceb4f02d7021
2022-09-29 14:28:51 -07:00
Cole Faust
01285d3737 Add colefaust@ and farivar@ to OWNERS
We update android lint and occasionally need to
update these checkers as well.

Test: Presubmits
Change-Id: I35961f9563acc95aed60c9bcf47650a5e0a19c53
2022-09-29 10:59:57 -07:00
Sorin Basca
7617023560 Merge "Unpin staledataclass-annotation-processor from Java 8" am: 818cc23210 am: 7ef2a66679 am: 78f8f9af2e am: 8b6aaf9081 am: 91b2223d19
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2234390

Change-Id: I46f2ac2dd51d71ce7d4f1064c1519efe4aa9d512
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 21:25:02 +00:00
Sorin Basca
91b2223d19 Merge "Unpin staledataclass-annotation-processor from Java 8" am: 818cc23210 am: 7ef2a66679 am: 78f8f9af2e am: 8b6aaf9081
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2234390

Change-Id: I2cf1ccd7ebde155698328eaa46f92cd71dc89361
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 21:17:41 +00:00
Sorin Basca
818cc23210 Merge "Unpin staledataclass-annotation-processor from Java 8" 2022-09-28 19:00:34 +00:00
Cole Faust
8ed095c389 Add null checks
Lint is being updated, and a type that used to be non-null
is now nullable, and needs to be null checked.

Bug: 247885568
Bug: 249337906
Bug: 249335143
Test: Presubmits
Change-Id: I3efc2d206a17a58dbff4306c98666cb4b06b0de7
2022-09-27 13:08:56 -07:00
Cole Faust
483efe1e41 Merge "Add null checks" am: 2e77ad99c6 am: 6eda1f24b6 am: 691e8c1e7b am: 3272f72e42
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2232549

Change-Id: Ifa8527fbe5790ee2c20572e2903e16e7b16001d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-27 18:29:15 +00:00