Commit Graph

6758 Commits

Author SHA1 Message Date
Qingqing Deng
18de5974b0 Merge "Update fontchain_linter.py to support more flags." into qt-dev
am: ebc44f129e

Change-Id: I58d0fb20a40e27471e02b5d2c99fc5bb7298d428
2019-05-15 23:17:48 -07:00
Qingqing Deng
0b5f272162 Update fontchain_linter.py to support more flags.
Android Q will support all region flags in UNSUPPORTED_FLAGS list.
BL - Saint Barthélemy
BQ - Caribbean Netherlands
MQ - Martinique
RE - Réunion
TF - French Southern Territories

Bug: 127811703
Test: Verified on device.
Test: m fontchain_lint
Test: minikin_tests --gtest_filter=EmojiTest.cpp
Test: atest cts/tests/tests/text/src/android/text/cts/EmojiTest.java
Test: atest frameworks/base/core/tests/coretests/src/android/text/EmojiTest.java
Change-Id: Ice1fb10af35dc4e180735d9712167b71635920da
2019-05-15 17:17:34 -07:00
Ian Pedowitz
563abce4ed Merge "Revert "Revert "Android Q is API 29""" into qt-dev
am: a326dfb1e5

Change-Id: I0674668835cd5a281e8a01c4b5bdb870595a8305
2019-05-15 13:36:05 -07:00
Ian Pedowitz
a326dfb1e5 Merge "Revert "Revert "Android Q is API 29""" into qt-dev 2019-05-15 16:28:54 +00:00
Elliott Hughes
78e68ceb2b Merge "Don't explicitly specify no prefix/suffix." am: 480d18c472
am: d47c87a2e6

Change-Id: I7cc6d962ec602c844ad9e7f6179260e247b04dc8
2019-05-13 11:22:04 -07:00
Ian Pedowitz
1912a57900 Revert "Revert "Android Q is API 29""
This reverts commit 60c71cee6e.

Reason for revert: Rolling forward for Q-Finalization

Bug: 131429032
Bug: 129975435
Change-Id: Idd812d93b767d8a672b9ada58c8bcc2441395847
2019-05-12 19:44:42 +00:00
Elliott Hughes
65c8b86b3f Don't explicitly specify no prefix/suffix.
Bug: http://b/129068177
Test: treehugger
Change-Id: Ica29efa3c3e49f556157cb0f82fdadef91aadba8
2019-05-11 00:13:09 +00:00
Elliott Hughes
f31f126ed8 Don't explicitly specify no prefix/suffix.
Bug: http://b/129068177
Test: treehugger
Change-Id: I987c88c17b7d1fd01129545bdbd4178de446188c
2019-05-10 17:02:14 -07:00
Stephen Hines
38b1fecaad Merge "NFC: Fix implicit fallthrough warning." am: 30fc8829ed
am: 4c4ac1c2b1

Change-Id: I8d3a746434bd551aff34593897cd85c7b53ec25f
2019-05-09 16:23:35 -07:00
Joe Onorato
8ef76ad915 Merge "Apilint updates" into qt-dev
am: dec99848ba

Change-Id: I8f2ceac86547be19775d2462fec38a8aca17330b
2019-05-09 14:12:16 -07:00
Treehugger Robot
30fc8829ed Merge "NFC: Fix implicit fallthrough warning." 2019-05-09 21:00:32 +00:00
Joe Onorato
dec99848ba Merge "Apilint updates" into qt-dev 2019-05-09 19:58:26 +00:00
Andrei-Valentin Onea
0c7c762cdc Merge "Support all UnsupportedAppUsage annotations in processor" am: 3423014cbe
am: c3c21f9195

Change-Id: I595aa4ddbf6f7d7774e17c6d6d88be40e4d59d0d
2019-05-09 08:46:32 -07:00
Stephen Hines
d17f06d488 NFC: Fix implicit fallthrough warning.
Bug: http://b/112564944
Test: Builds.
Change-Id: I3cbb6e751b1341ae8a9abcd04bd16c6b81156ff0
2019-05-08 16:41:06 -07:00
Joe Onorato
680d4fcd84 Apilint updates
- Make apilint not print in color when added to file.
  - Make apilint able to filter for classes or packages
  - Add frameworks/base/tools/apilint/apilint script that
    has convenient commandline interface for the main
    common use cases.

Bug: 132198274
Test: apilint_test.py
Test: manual
Change-Id: I78341f42b0fdf4b73a724423b14545b1861a3293
2019-05-08 13:31:07 -07:00
Andrei Onea
5e22614098 Support all UnsupportedAppUsage annotations in processor
Add support for the libcore UnsupportedAppUsage annotation to
UnsupportedAppUsageProcessor. This is in order to make the two
annotations even more interchangeable.
Also take the opportunity to correct the documentation:
UnsupportedAppUsageProcessor no longer is involved in creating
greylist.txt, that functionality has been moved to
Class2Greylist.java in the art repository.

Bug: 130721457
Test: m framework-annotation-proc
Change-Id: I5cf1f97ca41349fc053315a2fd5bfd53a80ae128
2019-05-08 18:03:15 +01:00
Ryan Mitchell
bfdebbbd3d Merge "DO NOT MERGE: Fixed broken aapt2 tests" into qt-dev
am: cbe933a40f

Change-Id: Ic0da145919936b8427ba9c6504606f1708832631
2019-05-07 10:48:07 -07:00
TreeHugger Robot
cbe933a40f Merge "DO NOT MERGE: Fixed broken aapt2 tests" into qt-dev 2019-05-07 17:28:17 +00:00
Ryan Mitchell
a5cfb6cf9a Merge "Build aapt2 statically on windows" into qt-dev
am: 274a7b2975

Change-Id: I6684ea4e1d1f2e44059da8ea3b3cec7b82987bff
2019-05-06 17:59:08 -07:00
TreeHugger Robot
274a7b2975 Merge "Build aapt2 statically on windows" into qt-dev 2019-05-07 00:26:40 +00:00
Ryan Mitchell
ac3bfcfc2a DO NOT MERGE: Fixed broken aapt2 tests
Some tests starting failing when
b435101ec8 was merged. It seems on qt-dev
aapt2_host_unit_tests does not run while it does on master.

Bug: 131762014
Bug: 129146717
Test: aapt2_tests
Change-Id: I701b275989c908acb78190be0930785712cb5686
2019-05-06 23:47:09 +00:00
Ryan Mitchell
319fc02cb8 Build aapt2 statically on windows
Prebuilt script is no longer updating libwinpthread-1.dll. Link the
windows executable statically so aapt2 will no longer require the
dependency on the dll.

Bug: 131883685
Test: manual test of aapt2.exe on windows without libwinpthread-1.dll
Change-Id: If78a8ec3030003862c18e3967e4d8333fde7928a
2019-05-06 19:07:58 +00:00
Ian Pedowitz
85ff9dacc5 Merge "Revert "RESTRICT AUTOMERGE Android Q is API 29"" into qt-dev
am: 40a8e99740

Change-Id: I1e2472a230baae25c2abe070a0ec75b9a8319c06
2019-05-02 14:48:57 -07:00
Ian Pedowitz
a17eabdc62 Merge changes from topic "QT-SDK-Finalization" into qt-dev
am: 917936172f

Change-Id: Ia7d0a4971a702966968abb59685dd1a13dff03ec
2019-05-02 14:14:57 -07:00
Joe Onorato
7fc8f1f82d Merge "Make am instrument capture logcat during test run, and return it to the host." into qt-dev
am: e587f53cb0

Change-Id: I04ff3bcfe64394cbbf431a71451b52290ba6016b
2019-05-02 12:54:29 -07:00
Ian Pedowitz
40a8e99740 Merge "Revert "RESTRICT AUTOMERGE Android Q is API 29"" into qt-dev 2019-05-02 00:59:09 +00:00
Ian Pedowitz
60c71cee6e Revert "RESTRICT AUTOMERGE Android Q is API 29"
This reverts commit 8a3d1f96e1.

Reason for revert: QT SDK Finalization. Will be merged again on/after May 13th

Bug: 131429032
Bug: 129975435
Change-Id: I7a48ef6a057a97ebd9903b7e934a7d95ec97f00e
2019-05-02 00:55:51 +00:00
Ian Pedowitz
917936172f Merge changes from topic "QT-SDK-Finalization" into qt-dev
* changes:
  RESTRICT AUTOMERGE Android Q is API 29
  RESTRICT AUTOMERGE Removing deprecated APIs added to Q
2019-05-02 00:53:29 +00:00
TreeHugger Robot
e587f53cb0 Merge "Make am instrument capture logcat during test run, and return it to the host." into qt-dev 2019-05-01 21:43:28 +00:00
Suprabh Shukla
8a3d1f96e1 RESTRICT AUTOMERGE Android Q is API 29
Time may be eternal, Captain, but our patience is not. It's time to put
an end to your trek through the stars.

Test: Builds, boots.

Bug: 131429032
Bug: 129975435
Change-Id: Ia2367124afb642dac0fb365e4fa096db1c648adb
2019-05-01 14:11:18 -07:00
Joe Onorato
50307d9792 Make am instrument capture logcat during test run, and return it to the host.
Also makes bit print that logcat, if available, instead of just the
stack trace.

This means that when you run a test you don't also have to run logcat in
some other window, and then scroll around forever looking for the one
test in question.

Test: bit -t GtsIncidentManagerTestCases:com.google.android.incident.gts.IncidentManagerTests\#testFail
Test: bit -t GtsIncidentManagerTestCases:com.google.android.incident.gts.IncidentManagerTests\#testDoesntExist
Bug: 129875642
Change-Id: I8940ff379c919482f4a545cb90d25bdbaa2b4f15
2019-05-01 13:02:25 -07:00
David Brazdil
6c45997124 Merge "hiddenapi: Support greylist-max-q" am: d749f8a4e7
am: 989ab78b0d

Change-Id: Ibfc8c22215f6e788125f61f5f6d360aca0371c34
2019-05-01 07:36:29 -07:00
David Brazdil
a4e64da2e4 hiddenapi: Support greylist-max-q
Test: set maxTargetSdk=Q on an API, compiles, check hiddenapi-flags.csv
Change-Id: I990972d652d4f4bc578592a9b3d9954f93b1ab9f
2019-05-01 11:57:05 +01:00
Michael Wright
76d0f71d00 Merge "Handle removed classes when looking for deprecated at birth APIs." into qt-dev
am: b0815a51e9

Change-Id: I0433c0c841ee49b194acc6105d19cd4eeeb372c0
2019-04-30 18:18:31 -07:00
Joe Onorato
e3b19fcf3a Merge changes I342cd7d0,I2c55831b into qt-dev
am: a58591179b

Change-Id: I0ba72b338102a3ef4ebbdef5ac37517ccc91ddc2
2019-04-30 12:50:11 -07:00
Ryan Mitchell
b505cc84bf Merge "Fix unknown resource type error message" into qt-dev
am: dd76b346d4

Change-Id: I1af6f93d990a940876dbb65fe7b158ff6a81a576
2019-04-30 11:05:27 -07:00
Ryan Mitchell
f07c58b97d Merge changes from topic "aapt2-attr" into qt-dev
am: ac919fcfcc

Change-Id: I97cffd87de2b8b9167af79fc07c83dfdf00dd10e
2019-04-30 06:06:31 -07:00
TreeHugger Robot
b0815a51e9 Merge "Handle removed classes when looking for deprecated at birth APIs." into qt-dev 2019-04-30 02:47:05 +00:00
Michael Wright
42dcfb8f57 Handle removed classes when looking for deprecated at birth APIs.
Removed APIs cause a KeyError when looking them up in the current API
surface. Instead, check if they're there first and if not just move on
since they no longer exist.

Bug: 129975435
Test: looked for new and deprecated system APIs
Change-Id: I46daa83ec8376190112418720f848afdf7cd7df2
2019-04-29 22:37:00 +01:00
Joe Onorato
a58591179b Merge changes I342cd7d0,I2c55831b into qt-dev
* changes:
  Get incidentd cts working again.
  Don't include restricted images in incident reports unless they're specifically mentioned in the IncidentReportArgs
2019-04-29 19:21:24 +00:00
Ryan Mitchell
d2e25b9382 Merge "DO NOT MERGE: Do not allow overlaying of attributes with conflicting formats" into qt-dev
am: 515e9b3b63

Change-Id: Iebe16a02b6721e777af8afbd5bc395c47c510f0e
2019-04-29 11:59:54 -07:00
TreeHugger Robot
dd76b346d4 Merge "Fix unknown resource type error message" into qt-dev 2019-04-29 14:48:53 +00:00
Ryan Mitchell
ac919fcfcc Merge changes from topic "aapt2-attr" into qt-dev
* changes:
  Add formats for declare-styleable attributes
  No new attributes in declare-styleables when format is not provided
2019-04-27 01:54:11 +00:00
Joe Onorato
e547205eec Get incidentd cts working again.
- The buffer size increased, and the CTS test that checked that
  was triggering.
- Privacy filtering wasn't working for the stack trace sections
- The incident command was not handling the default arguments correctly
- The throttler was throttling streaming reports, which made the
  test flaky.

Bug: 126253679
Test: atest CtsIncidentHostTestCases
Change-Id: I342cd7d0421ea8c22b7796fc99e779f21855af73
2019-04-26 17:44:10 -07:00
Ryan Mitchell
2e2c3b6220 Fix unknown resource type error message
Instead of printing the tag name, print the type name when the type was
unable to be recognized. The type name is initialized to the tag name
and changes when a type attribute is defined..

Bug: 37891551
Test: manual
Change-Id: I9b0e6a6f2d96a8c5af71fbca8e83c947a8e308bf
2019-04-26 01:16:52 -07:00
Ryan Mitchell
b435101ec8 DO NOT MERGE: Do not allow overlaying of attributes with conflicting formats
aapt(1) does not allow for attributes to be redefined with a different
format. Also, attributes declared with enums or flags are never allowed to be
redefined. This change will not allow attributes to be redefined with a
conflicting format in aapt2.

Bug: 129146717
Test: aapt2_tests
Change-Id: Idc43d6d689199ba2cdc672d009ede22eaa75a10c
2019-04-24 09:59:55 +00:00
Ryan Mitchell
acde95c3fc No new attributes in declare-styleables when format is not provided
AAPT does not allow for attributes declared in declare-styleables
that do not have a format to create new attribute resources. AAPT2
does and should not.

Bug: 131100106
Test: aapt2_tests
Change-Id: Id00884dc9ed939672df90f670a7915d4b6d232c1
2019-04-23 08:32:30 -07:00
Dan Willemsen
39a77f1951 Merge changes from topic "R"
* changes:
  master designated for R. Update MAX_PLATFORM_VERSION, etc.
  AAPT2: Update SDK development codename to Q
2019-04-20 01:06:00 +00:00
Colin Cross
c441b4646e Merge "locked_region_code_injection: copy jar timestamp to output" am: 69db849f7c
am: 538193abed

Change-Id: I5dcbb0aa806bede7e76caa06b75a11c2269299f8
2019-04-18 19:25:52 -07:00
Treehugger Robot
69db849f7c Merge "locked_region_code_injection: copy jar timestamp to output" 2019-04-19 01:57:28 +00:00