Commit Graph

7762 Commits

Author SHA1 Message Date
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
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
Hans Boehm
e16473b1da Merge "Make LoadClass collect garbage as promised" 2022-10-06 23:34:08 +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
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
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
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
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
Sorin Basca
73cb9bdb19 Unpin staledataclass-annotation-processor from Java 8
Test: m
Fixes: 139342589
Change-Id: Ie4791425a4fcdf551ffa70b2c02ab3ed13e57eaa
2022-09-27 18:02:06 +01:00
Cole Faust
7b364e515c 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
Test: Presubmits
Change-Id: I7fc09a9d2d312485071364279c448550e3a1e124
Merged-In: Ie6eaf061d74bd773742aa47f731e95e4b137f438
2022-09-27 00:16:50 +00:00
Treehugger Robot
37453749d9 Merge "Remove Python enables identical to global defaults." am: 3fd51ff02a am: a728156a2d am: 1c9e3b6c5a am: 3a47e2f6e9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2220474

Change-Id: Ic89b64fc53e01ae36b3884c117a9242706265327
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20 15:29:43 +00:00
Krzysztof Kosiński
3fb6fc6b11 Remove Python enables identical to global defaults.
Bug: 245854393
Test: presubmit
Change-Id: I7c4a9faa4919d01a751d607b32c184618f2ebefc
2022-09-18 01:52:09 +00:00
Romain Jobredeaux
cf6fe41fbd Merge "Manual BUILD file for first Kotlin target." am: b5f31291ee am: c63cffdb50 am: 1139f89620 am: d1d76263af
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2210099

Change-Id: If958176cc761921a4110935de40f81a618fe52ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 15:10:50 +00:00
Romain Jobredeaux
b5f31291ee Merge "Manual BUILD file for first Kotlin target." 2022-09-13 13:28:39 +00:00
Romain Jobredeaux
33c2b58f4a Manual BUILD file for first Kotlin target.
Change-Id: I290d43170022f12c0acda9ebd5106d5148141a1d
Test: automatically added to CI.
Bug: 186462641
2022-09-08 10:54:11 -04:00
Yike Zhang
6d6aab8876 Merge "Use PushFilePreparer to push files in PreloadCheck" am: 6040384899 am: 2570d996db am: 25334d16a4 am: 9752c82ef0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2198760

Change-Id: I66a663d5339e8ebbf91a42c8256324d1f9a5fb68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-07 04:19:19 +00:00
Yike Zhang
6040384899 Merge "Use PushFilePreparer to push files in PreloadCheck" 2022-09-07 02:18:23 +00:00
Colin Cross
78ef274d1b Merge "Fix more kotlin 1.7.0 errors" 2022-09-01 22:12:29 +00:00
Yike
e431c26b09 Use PushFilePreparer to push files in PreloadCheck
This change modifies the test config file by switching to use `PushFilePreparer` instead of `FilePusher`, since the `FilePusher` class which is defined in `compatibility-tradefed` is designed for the tests that are part of compatibility suite, but PreloadCheck is not.

Bug: 220991354
Test: atest PreloadCheck
Change-Id: Id25a16d6339b0ec8b5b61f1799c842f5ebd143ba
2022-09-01 14:09:26 +08:00
Treehugger Robot
c7f844c610 Merge "aapt2: Fix deprecated proto API usage." am: 2992680274 am: aeaa62c5d0 am: d682efe214 am: 2138ab2378
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2176683

Change-Id: I1d362eba5c9632c8bab73f9bd4f526a55b47ac61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-25 22:56:16 +00:00
Treehugger Robot
2992680274 Merge "aapt2: Fix deprecated proto API usage." 2022-08-25 21:22:48 +00:00
Treehugger Robot
289cea07c0 Merge "Adding myself as an owner for the lint check I will create in master" am: 001d56175c am: 7247885ab8 am: 16a21fd932 am: e7d3d81fa3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2193855

Change-Id: Ib44cb6f73c8d0c19607eca5c4065b66ddef98edf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24 21:30:28 +00:00
Jacob Hobbie
c8fd1e1e14 Adding myself as an owner for the lint check I will create in master
Change-Id: I2022845ee42f23436df94895e09657d584521fdf
2022-08-23 20:26:59 +00:00
Colin Cross
0a1823f990 Fix more kotlin 1.7.0 errors
Fix "'when' expression must be exhaustive" and UNEXPECTED_SAFE_CALL
errors.

Bug: 216136346
Test: m checkbuild
Change-Id: I2c1b1f7581426496f31198896c4ff3bd9abf2941
Merged-In: I2c1b1f7581426496f31198896c4ff3bd9abf2941
2022-08-17 19:18:58 +00:00
Colin Cross
f8fd658993 Merge "Fix more kotlin 1.7.0 errors" into tm-qpr-dev-plus-aosp 2022-08-15 20:35:19 +00:00
Treehugger Robot
4472bf50e2 Merge "Fix unused-but-set-variable warnings" am: eab658e213 am: 0699d0238b am: f05b15d261 am: a0fdfa3524
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2160458

Change-Id: I5a240f999bb994fd4593067d2cf57451afa133f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 21:30:27 +00:00
Colin Cross
61be78718f Fix more kotlin 1.7.0 errors
Fix "'when' expression must be exhaustive" and UNEXPECTED_SAFE_CALL
errors.

Bug: 216136346
Test: m checkbuild
Change-Id: I2c1b1f7581426496f31198896c4ff3bd9abf2941
(cherry picked from commit 64acfee25d)
Merged-In: I2c1b1f7581426496f31198896c4ff3bd9abf2941
2022-08-12 21:06:14 +00:00
Treehugger Robot
0699d0238b Merge "Fix unused-but-set-variable warnings" am: eab658e213
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2160458

Change-Id: Iaf85e75223310d32ea972c779d5146748f2d9653
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 20:26:55 +00:00
Treehugger Robot
eab658e213 Merge "Fix unused-but-set-variable warnings" 2022-08-12 20:00:13 +00:00
Jeff Sharkey
11e74d1552 Merge "Migrate stringslint.py to AyeAye." am: a27c2fd643 am: ee6282d087 am: b7a2bcf976 am: ccfb40a9d8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2174702

Change-Id: I296b441d44ff2b368483fcd8932414d7ffa090f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09 18:59:49 +00:00
Jeff Sharkey
ee6282d087 Merge "Migrate stringslint.py to AyeAye." am: a27c2fd643
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2174702

Change-Id: I8b323ef4668b05375d0825f9d34588468cf33662
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09 17:48:33 +00:00
TreeHugger Robot
b446de7503 Merge changes from topic "b/232475788-frameworks/base" into tm-qpr-dev am: 317201974a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19457538

Change-Id: Ia79695069f20fe1a66db965780cf7d8532325db6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 15:31:09 +00:00
Krzysztof Kosiński
92d263378a aapt2: Fix deprecated proto API usage.
Bug: 203713560
Test: presubmit
Change-Id: Ie8bb2c010cff1c2e861918496290d1ef6dd6daef
2022-08-06 08:24:47 +00:00
Jeff Sharkey
6e2c566316 Migrate stringslint.py to AyeAye.
This script has been deprecated and replaced by AyeAye checks
directly in Gerrit.

Bug: 164530987
Test: none
Change-Id: I6a36c0a7ac10cbec0667780c30ba4a20124edee4
2022-08-03 13:50:28 -06:00
Mårten Kongstad
b0502bb700 Scaffolding: reject installs based on device fingerprint
Add the scaffolding for teaching the package parser to reject a package
if its manifest specifies a set of prefixes, and the device fingerprint
does not start with one of the prefixes.

Bug: b/232475788
Test: m
Change-Id: I9f3f3d3ad96332d2d65fbf6f58c7ce35992bcd7e
2022-08-01 18:03:59 +00:00
Cole Faust
907b32ebdc Disable AndroidFrameworkLintCheckerTest
Andorid lint was updated, and now includes some
prebuilt classes compiled for java 15. The soong
build doesn't support java 15 yet, so we can't have
modules that compile against lint right now.

Bug: 239881504
Bug: 236431222
Test: Presubmits
Change-Id: Idc85e23438c1c5b1e7862312298e14e96cf2213e
2022-07-22 18:08:03 +00:00
Cole Faust
f3944eb168 Add -Xjvm-default=all
Android lint is being updated, and now requires
custom detectors to be compiled with -Xjvm-default=all.

This is a cherrypick without the fixes for indentation
errors because lint is not actually run on these older
branches, but the custom detectors are compiled.

Bug: 236431222
Test: Presubmits
Change-Id: Idf5302302496a6dff0f79ced4e20327041ae7a5a
(cherry picked from commit b331e4e254)
(cherry picked from commit 116be9d69f)
2022-07-22 14:52:15 +00:00
Yi Kong
b172c3161f Fix unused-but-set-variable warnings
These are essentially dead code...

Test: presubmit
Bug: 197240255
Change-Id: If36fa244990cb7d101fce57bcd5d8115f8722064
2022-07-20 15:16:58 +08:00
Hans Boehm
0f8fc9a0c9 Make LoadClass collect garbage as promised
I found no clients or tests for this. But System.gc() by itself does
nothing, so the original version clearly does not work as intended. The
revised version may.

Bug: 193185229
Test: Treehugger
Change-Id: Ie4e59834a6dd23d83f30f8d0aaa1bf6d124ade91
2022-07-11 16:40:51 -07:00
Treehugger Robot
f116c05101 Merge "Require CONFIG_HID_PLAYSTATION for DualSense key layout" 2022-06-22 15:27:58 +00:00
Jeff Sharkey
d1ff8f6b91 Merge "Add OWNERS file for frameworks/base/tools/localedata/extract_icu_data.py" am: f9d5016fe0 am: b7648eedf4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2127444

Change-Id: I999c9e0d70585983f2dcf0b8d69313ac9dd6ed84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 14:13:03 +00:00
Jeff Sharkey
f9d5016fe0 Merge "Add OWNERS file for frameworks/base/tools/localedata/extract_icu_data.py" 2022-06-22 13:31:46 +00:00
Siarhei Vishniakou
8169da18d8 Require CONFIG_HID_PLAYSTATION for DualSense key layout
Some olders kernels don't yet support HID_PLAYSTATION. While they are
working on supporting this driver, provide this temporary solution.

Before this patch, if the key layout is loaded, but there is no
HID_PLAYSTATION, then the mappings on the device will be incorrect.

With this patch, this key layout will not be loaded unless there is a
CONFIG_HID_PLAYSTATION enabled on the device.

Instead, when the main layout cannot be loaded, we make another attempt
to load a fallback layout. This way, the mappings on DualSense can be
correct even if the HID_PLAYSTATION module is not loaded.

In this CL, the fallback layout was tested using controllerTester.

Bug: 228005926
Test: tested mappings with a DualSense controller on a device that does
not have CONFIG_HID_PLAYSTATION

Change-Id: I7e46ae1943cd2c63b8c0b03fdf5d71adeea89f6f
Merged-In: I7e46ae1943cd2c63b8c0b03fdf5d71adeea89f6f
2022-06-16 17:34:37 +00:00
Victor Chang
9c26b0b301 Add OWNERS file for frameworks/base/tools/localedata/extract_icu_data.py
This folder has only one script extract_icu_data.py.
The script parses the ICU data and generates a .cpp file.
Thus, add external/icu/OWNERS as the owner here.

Test: treehugger
Change-Id: I555e9785c576688e43e6362050180345c81d6c3e
2022-06-16 15:44:40 +01:00
Treehugger Robot
9c08165379 Merge "Fix kotlin deprecation warnings" am: f9bf6544a6 am: 255f4d7911
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2115256

Change-Id: I17c0490acdd9d936c426ed25869d363524ba94e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 20:08:12 +00:00
Treehugger Robot
255f4d7911 Merge "Fix kotlin deprecation warnings" am: f9bf6544a6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2115256

Change-Id: I5a9011f30f9827fde42d1596035ab310355fbe68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 19:45:11 +00:00