Commit Graph

7498 Commits

Author SHA1 Message Date
Colin Cross
ff02f9a70e Rename T to Tiramisu
PLATFORM_VERSION_CODENAME is being updated from T to Tiramisu.

Bug: 186121492
Bug: 194055070
Test: m checkbuild
Change-Id: I6882018a916dc1c71abc442068cb54fb9c42ff3c
Merged-In: I6882018a916dc1c71abc442068cb54fb9c42ff3c
2021-07-23 21:06:15 +00:00
Kohsuke Yatoh
0a93841c46 Merge "Extract flag font from NotoColorEmoji" into sc-dev am: 80a8cf86c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14970179

Change-Id: If11584176cfc18d8580dc021fabf6fb8445b1cdc
2021-06-29 00:56:10 +00:00
Seigo Nonaka
458f1dd71c Extract flag font from NotoColorEmoji
Bug: 188926991
Bug: 188779144
Test: m fontchain_lint
Change-Id: Ie807e31abb407f5b58665d4d2941bc75186d5c42
Merged-In: Ie807e31abb407f5b58665d4d2941bc75186d5c42
2021-06-24 18:46:08 +00:00
Jeff Sharkey
80865170ce Merge "Emit "usesPermissionFlags" in "dump badging"." into sc-dev am: c206d63edc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14019347

Change-Id: I7e42cd52e8ba333dd00faa635767373d56adc30b
2021-06-04 22:20:08 +00:00
Jeff Sharkey
c206d63edc Merge "Emit "usesPermissionFlags" in "dump badging"." into sc-dev 2021-06-04 22:06:55 +00:00
Colin Cross
0df037d6ae Merge "Support codename T in aapt2" am: ff7bba27a8 am: 90b463900a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1715428

Change-Id: I6a9db68648a48c06bb0af370577b185d4cdcad04
2021-06-03 09:18:39 +00:00
Jeff Sharkey
b3a4448be3 Merge changes from topic "may27-sdk" into sc-dev am: e6fb6087aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14749815

Change-Id: I9ac77657a3bde896f7a90fa9879daf66f5f7a35a
2021-06-02 20:14:07 +00:00
Colin Cross
ff7bba27a8 Merge "Support codename T in aapt2" 2021-06-01 23:27:30 +00:00
Jeff Sharkey
de062e478c Finalize resource IDs; script to help in future.
Bug: 171506470
Test: Build
Change-Id: I7b7360475ff0f6f4d4c8b8872eefc4e80fd9640e
2021-06-01 06:48:52 -06:00
Jeff Sharkey
7c5f4337fd platform/frameworks/base/ - S is now 31
Bug: 171506470
Test: Build
Change-Id: I46d4df5f27783a96a58c966b113391ea3bc112cb
2021-06-01 06:48:51 -06:00
Jeff Sharkey
2a696f7a18 Merge changes from topic "may26-dab" into sc-dev am: 163db52409
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14738430

Change-Id: Idfbd586484a6fc76a2003456341932bfa8b6baaf
2021-05-26 21:14:30 +00:00
Jeff Sharkey
13bc791d51 Reintroduce "Deprecated at Birth" linter.
Earlier this year the "apilint.py" script was removed from the build,
since it's been replaced by Metalava.  However, several features
haven't been ported yet, so this change revives them to support the
SDK finalization process.

This change also updates the script to handle "Signature format: 2.0"
files, and reads the API surface from a directory which contains
several ".txt" files to support the new Mainline API structuring.

Bug: 189224267
Test: manual
Change-Id: Ifc4c24a7e159db6725897800d67947d1fd8b9880
2021-05-26 12:07:25 -06:00
Seth Moore
31c1300fe1 Merge "Check for Ignore-AOSP-First commit tag" into sc-dev am: a63e111574
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14703967

Change-Id: If7120daa47a8fd6d3b01afa2d7bae9826bf3b1ea
2021-05-26 16:27:41 +00:00
Seth Moore
f3d78421ba Check for Ignore-AOSP-First commit tag
If the Ignore-AOSP-First tag is in a commit message, it means the
committer is intentionally bypassing the AOSP source of truth. Check
for this tag in the AOSP-first presubmit hook so that devs don't have
to turn off hooks to get past the AOSP-first policy in exceptional
cases.

Bug: 189139990
Change-Id: I18231b93d7f213c13ace0a0af24bb20a394cc50f
Merged-In: I18231b93d7f213c13ace0a0af24bb20a394cc50f
Test: Manual testing with various commit messages
2021-05-26 09:17:27 -07:00
Seth Moore
a63e111574 Merge "Check for Ignore-AOSP-First commit tag" into sc-dev 2021-05-26 16:02:06 +00:00
Seth Moore
627b9ca3b7 Check for Ignore-AOSP-First commit tag
If the Ignore-AOSP-First tag is in a commit message, it means the
committer is intentionally bypassing the AOSP source of truth. Check
for this tag in the AOSP-first presubmit hook so that devs don't have
to turn off hooks to get past the AOSP-first policy in exceptional
cases.

Bug: 189139990
Change-Id: I18231b93d7f213c13ace0a0af24bb20a394cc50f
Test: Manual testing with various commit messages
2021-05-24 14:15:36 -07:00
Patrick Baumann
dff37ee6d2 Merge "Updates OWNERS files" into sc-dev 2021-05-24 18:30:19 +00:00
Patrick Baumann
43628ca24c Updates OWNERS files
Bug: 186864416
Test: Builds
Change-Id: I04dfc5c2c7143825334ebc62742e335b8c889492
2021-05-21 14:13:18 -07:00
Colin Cross
a1250b59ab Support codename T in aapt2
Bug: 186121492
Test: treehugger
Change-Id: I3f136f505bce80d0eb7f8b0cca316041730a4580
2021-05-21 10:23:17 -07:00
Ryan Mitchell
a73daaeb5c Merge "Do not call pop_back when app has no uses-sdk" into sc-dev am: 47e58f1238
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14664167

Change-Id: I05aad42f7077ee8f285e8df581608e872731834c
2021-05-20 23:37:22 +00:00
Ryan Mitchell
6ea9ed3d5f Do not call pop_back when app has no uses-sdk
Calling pop_back on an empty container results in undefined behavior.
aapt2 dump badging seg faults when used on an APK with no uses-sdk.

Bug: 188461703
Test: aapt2 dump badging HelloAppTest.apk
Change-Id: I8d8308a06d542f003ae399629bdbfb5b845674fc
2021-05-20 13:55:12 -07:00
Christopher Ferris
d1172f3b04 Merge "Add a cherry-pick exception." am: 9510033467 am: 6733d0ef8a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1711190

Change-Id: I81ac1a60ab33b059488109f1aa7efada363bb3ff
2021-05-18 23:36:45 +00:00
Treehugger Robot
6a958235ec Merge "Revert^2 "Fix incompatibilities with Kotlin 1.5.0"" am: b7bccf0c76 am: c4db697186
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1709778

Change-Id: If3e51f818d2ac479af7f829b0781fbefffe028f4
2021-05-18 23:17:14 +00:00
Patrick Baumann
62bf50bbd8 Merge changes I04dfc5c2,Idc7e1f3c am: 1ef34e9022 am: 4c56bac295
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705089

Change-Id: Ibea92e6623d660b0bcbc324c8f188642841160dd
2021-05-18 23:16:02 +00:00
Christopher Ferris
9510033467 Merge "Add a cherry-pick exception." 2021-05-18 22:50:29 +00:00
Treehugger Robot
b7bccf0c76 Merge "Revert^2 "Fix incompatibilities with Kotlin 1.5.0"" 2021-05-18 20:54:38 +00:00
Christopher Ferris
9fbe8a8279 Add a cherry-pick exception.
If someone is trying to cherry-pick back to aosp, don't force them
to use --no-verify, allow it.

Right now, the only form of cherry-pick allowed is:

  cherry picked from

Test: Ran on a commit with the message and without and observed that
Test: with the cherry pick message, no error, without, error message.
Change-Id: I27581f782cdc1a1c4fa207a3aae392c0d434eb5a
2021-05-18 13:49:08 -07:00
Patrick Baumann
1ef34e9022 Merge changes I04dfc5c2,Idc7e1f3c
* changes:
  Updates OWNERS files
  Update OWNERS file.
2021-05-18 19:03:06 +00:00
Aurimas Liutikas
b715c4d730 Revert^2 "Fix incompatibilities with Kotlin 1.5.0"
c5b4071877

Change-Id: I1fc09f028411cce8bdaa9eec68eaf88116f2143f
2021-05-17 17:41:41 +00:00
Patrick Baumann
e6c0a4f8ce Updates OWNERS files
Bug: 186864416
Test: Builds
Change-Id: I04dfc5c2c7143825334ebc62742e335b8c889492
2021-05-14 15:45:42 +00:00
Elliott Hughes
05ba318dfc Merge "Remove a use of String16::remove." am: 0529640cc0 am: c881ac71b5 am: 9853e8a94e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1704170

Change-Id: I31b89ce8b8504388deab49d9af7410f8d64b78fd
2021-05-13 19:44:55 +00:00
Aurimas Liutikas
b357fadd1e Merge "Revert "Fix incompatibilities with Kotlin 1.5.0"" am: f1e2bb9a81 am: c2db9c85cc am: 51a1b7d082
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705633

Change-Id: I20f9e94bb3241e07052edbe8c042162c2ad6f118
2021-05-12 23:09:41 +00:00
Aurimas Liutikas
c5b4071877 Revert "Fix incompatibilities with Kotlin 1.5.0"
This reverts commit b8ca1157ab.

Reason for revert: b/187908823

Change-Id: I9606c5730f4e8697a9319939acda0a9b7a74634d
2021-05-12 21:56:31 +00:00
Elliott Hughes
0523328a00 Remove a use of String16::remove.
This function, ironically, is being removed. This is one of only two
users, and it's pretty hard to use correctly. In this case, using one
of the existing constructors to keep a prefix seems clearer even in a
world where remove() was better implemented.

Test: treehugger
Change-Id: Icdf02d9fcc059c396c13787d9bb4e8bda5658656
2021-05-11 16:24:35 -07:00
Aurimas Liutikas
4c9b195cae Merge "Fix incompatibilities with Kotlin 1.5.0" am: 600dcaf908 am: 70ba49b0e5 am: c61fdfd2d1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1697314

Change-Id: I4c76908e0cf9a1ba0493322c1f8dedb4fa925e80
2021-05-11 21:20:45 +00:00
TreeHugger Robot
30f6ef3a7b Merge "Fix segmentation fault in aapt2" into sc-dev 2021-05-11 21:05:42 +00:00
TreeHugger Robot
a1f1ba172b Merge "Add <staging-public-group-final> to aapt2 (2/2)" into sc-dev 2021-05-11 20:27:56 +00:00
Kelvin Zhang
3965584d3a Fix segmentation fault in aapt2
When passing a single iterator to std::vector::eraase, only element at
that iterator is removed. If no elements are filtered, std::remove_if()
returns the end iterator, attempting to erase() the end iterator can
cause segmentation fault. This bug causes signing test to fail.
https://atp.googleplex.com/tests/asit/ota/signing?tabId=test_run

Test: aapt2
PRODUCT/app/CalculatorGooglePrebuilt/CalculatorGooglePrebuilt.apk

Bug: 175789289
Bug: 178554651

Change-Id: I813055238bef2dcbdf76172a00b3f44ae940b759
(cherry picked from commit b88ccf80aa)
2021-05-11 17:18:45 +00:00
TreeHugger Robot
3266b6970c Merge "Fix aapt badging segmentation fault" into sc-dev 2021-05-11 16:48:45 +00:00
Ryan Mitchell
2ec8e1b71f Add <staging-public-group-final> to aapt2 (2/2)
Fixes BinaryResourceParser loading of alias chunk and makes changes
that did not get committed in 2fedba9a32.

Bug: 183411356
Test: aapt2_test
Change-Id: Ieff9166100019f38ddcfe900014709b15db24e43
2021-05-11 08:28:00 -07:00
Ryan Mitchell
2fedba9a32 Add <staging-public-group-final> to aapt2
To allow apps that compiled against a pre-release SDK to continue
working for a period of time after API finalization, a new tag,
<staging-public-group-final>, has been added to aapt2.

When finalizing the framework resource API, converting
<staging-public-group> tags to <staging-public-group-final> will
cause aapt2 to generate the resource table so that there is a resource
entry for the old non-finalized (staged) resource ID and another entry
for the finalized resource ID of newly finalized resources. This allows
an application that compiled against the pre-release SDK to continue
resolving resources using pre-release resource IDs.

All references to pre-release resource IDs will be rewritten to their
finalized resource IDs through the information stored in the new staged
alias chunk. This allows applications compiled against
<staging-public-group> resources to use the newly finalized
resource ID without re-compilation.

When an application is re-compiled against the SDK with
<staging-public-group-final> tags, the application will use the
finalized resource IDs.

This change limits the use of the alias chunk to the framework for S.

Bug: 183411356
Test: aapt2_test
Change-Id: Iba1c3033c3c2f32de8e4a19b58d3921c971092c4
2021-05-10 17:22:33 -07:00
Ryan Mitchell
957168e2b2 Fix aapt badging segmentation fault
Unsigned subtraction lead to arithmetic overflow which caused aapt
to reference the vector out of its bounds.

Bug: 175789289
Test: dump badging on a manifest with no uses-sdk tag
Change-Id: Id1b96376a8bfe13c0c195bb6f62b681c3d686034
2021-05-10 11:46:49 -07:00
Aurimas Liutikas
b8ca1157ab Fix incompatibilities with Kotlin 1.5.0
Test: make
Change-Id: I9bc49c759d0b2527b6419f5d711e394402a7e781
2021-05-07 23:00:23 +00:00
TreeHugger Robot
7b526955cd Merge "Update fontchain_linter.py to be compatible with Compat font" into sc-dev 2021-05-07 20:00:38 +00:00
Seigo Nonaka
2e9e792e6e Update fontchain_linter.py to be compatible with Compat font
Bug: 186700756
Test: m fontchain_lint
Change-Id: Ibfe33f29f3db998fdc0db1bbf35851841ca73d9a
2021-05-04 17:12:35 -07:00
Ryan Mitchell
ea15d442b2 Merge "Fix uninitialized macro reference member" into sc-dev 2021-05-04 22:49:07 +00:00
Ryan Mitchell
556d84ca6c Merge "AAPT2: Only print last uses-sdk tag" into sc-dev 2021-05-04 17:47:50 +00:00
Ryan Mitchell
ad49736def Merge "Add aapt to aapt2_artifacts" into sc-dev 2021-05-04 17:41:05 +00:00
Ryan Mitchell
c3d6932d38 Add aapt to aapt2_artifacts
Adds aapt to aapt2_artifacts dist target so the binary will appear
in the ub-aapt2-release branch.

Bug: 175789289
Test: none
Change-Id: I8963eecfd7667196fc3651a00d9a744cddd2c24b
2021-05-04 07:42:46 -07:00
Ryan Mitchell
a2b4fcde92 Fix uninitialized macro reference member
Reference::allow_raw was left uninitialized.

Bug: 175616308
Test: aapt2_tests
Change-Id: I58a560c7fb278c1aa2b415e456f849999c835155
2021-05-03 16:17:28 -07:00