Commit Graph

6164 Commits

Author SHA1 Message Date
Seigo Nonaka
29f208b483 Merge "Update font chain linter to match latest font file" into pi-dev am: 31c4a48267
am: df8ed7a446

Change-Id: Idb7374c2e71b2124ed50a8d6b3d6c3f4e363bb9d
2018-05-16 15:58:13 -07:00
Seigo Nonaka
df8ed7a446 Merge "Update font chain linter to match latest font file" into pi-dev
am: 31c4a48267

Change-Id: Ia5f7799fcb43b59adfc672a9d7af0f6a8c583f09
2018-05-16 15:38:26 -07:00
TreeHugger Robot
31c4a48267 Merge "Update font chain linter to match latest font file" into pi-dev 2018-05-16 22:11:17 +00:00
Yi Jin
287e14bb20 Merge "The argument type is bool, the current bug passes a "true" or "false" string." into pi-dev am: 0a3815958a
am: 6ef148ce5c

Change-Id: Ie5ca5fe0df06c14b8c72108ef53313b41b4acac4
2018-05-15 12:23:53 -07:00
Yi Jin
6ef148ce5c Merge "The argument type is bool, the current bug passes a "true" or "false" string." into pi-dev
am: 0a3815958a

Change-Id: Iadf8a52e65ba7930f419eacbaac9816992715506
2018-05-15 11:27:13 -07:00
Seigo Nonaka
c18086310b Update font chain linter to match latest font file
- FAMILY emoji now has own gender neutral emoji
- Some flags are newly supported
- Some regions may have the same flags.

Bug: 77148691
Test: m fontchain_lint
Change-Id: If1a69974230f025d35503eb49bea105923593e87
2018-05-15 16:09:48 +00:00
Yi Jin
480a956521 The argument type is bool, the current bug passes a "true" or "false"
string.

Bug: 79710844
Test: atest incidentd_test
Change-Id: I66fc086e4a194e68638311ccdc305a495ecf8da4
2018-05-14 18:04:29 -07:00
Pirama Arumuga Nainar
8b83f5c401 Merge "For Win32, don't cast ssize_t while printing" am: aaf8d7aa2e am: 466ada94fe
am: ea5cf9f31c

Change-Id: I77ee34cf56d68614b2f6e315c7f4797494f89c55
2018-05-14 11:32:16 -07:00
Pirama Arumuga Nainar
ea5cf9f31c Merge "For Win32, don't cast ssize_t while printing" am: aaf8d7aa2e
am: 466ada94fe

Change-Id: I39b73406a41ecc5396c39648f8e05e8a88e7aaee
2018-05-14 11:22:57 -07:00
Pirama Arumuga Nainar
dc36bb6dea For Win32, don't cast ssize_t while printing
Bug: http://b/69933068

This is a partial revert of
https://android-review.googlesource.com/c/platform/frameworks/base/+/109433
so we can use Clang for windows cross compilation.

Clang does not allow a cast to 'signed size_t' and both Clang and
current MinGW accept a ssize_t to the '%zd' format specifier.

Test: m native-host, m native-host-cross with both MinGW and Clang
Change-Id: I5366622b91be1433f6c533c55a9ae429b57c7a27
2018-05-11 23:22:10 +00:00
Ryan Mitchell
3a20be789f Merge "AAPT2: Insert platformBuild information" into pi-dev am: 91d2f87d0e
am: 78e0e6aa2e

Change-Id: I6fb1af5b521c5a887ee494c745b83592e48228de
2018-05-11 08:41:00 -07:00
Ryan Mitchell
78e0e6aa2e Merge "AAPT2: Insert platformBuild information" into pi-dev
am: 91d2f87d0e

Change-Id: Ifa673f17cb3ee1ecb146aaafab7c3c71b47f7154
2018-05-11 08:30:35 -07:00
Ryan Mitchell
91d2f87d0e Merge "AAPT2: Insert platformBuild information" into pi-dev 2018-05-11 15:18:56 +00:00
Ryan Mitchell
7cb82a86be AAPT2: Insert platformBuild information
Inserts platformBuildVersionName and platformBuildVersionName when the
attributes are not currrently present. The attributes are set to
the values of versionName and versionCode.

Bug: 77541121
Test: Build apk using aapt and appt2 and dumped using xmltree to confirm
the presence of the attributes
Change-Id: I5330381905c878fb877214b42f83d7e2e48cd062
2018-05-10 15:37:37 -07:00
android-build-team Robot
cd04ac517e Merge "Move libstatssocket to system/ so that lmkd can build on PDK." into pi-dev am: 8ca46fc4ac
am: f01c08de24

Change-Id: I8876c0b819165fb5a9404229c7c7f03b510d7ebd
2018-05-09 12:28:19 -07:00
android-build-team Robot
f01c08de24 Merge "Move libstatssocket to system/ so that lmkd can build on PDK." into pi-dev
am: 8ca46fc4ac

Change-Id: I70b7f3187da66eb720d1bc0c5ac83658ea4a6280
2018-05-09 11:46:43 -07:00
android-build-team Robot
8ca46fc4ac Merge "Move libstatssocket to system/ so that lmkd can build on PDK." into pi-dev 2018-05-09 18:08:46 +00:00
android-build-team Robot
ccb89f9263 Merge "Adding batterystats history to proto dump." into pi-dev
am: 291b944d89

Change-Id: Ie1766ac31bc048eeba13d540c446372ef56c2da6
2018-05-08 08:11:22 -07:00
David Brazdil
2200a1b83b Add presubmit hook for hidden API lists.
Check that they're sorted as expected and contain no duplicates.
The sort order now uses:
$ LC_COLLATE=C sort -f

So that non-alphanumeric characters are not ignored, giving a more
intuitive sort order. the '-f' means ignore case.

Also sort the existing lists accordingly.

Test: repo upload
Bug: 64382372
Merged-In: I52b884da33a9a46455df6747a215683d9d3c3218
Change-Id: Icc124fd8ceb3f001a9c11bbf40e0a111910c6b39
(cherry picked from commit e5dc64d428)
2018-05-08 10:29:50 +01:00
Kweku Adams
3d16091dd2 Adding batterystats history to proto dump.
It will only print out a dump for userdebug or eng builds.

This is the same change as the pi-dev one (http://ag/3909863), but due
to changes in master, that change has a merge conflict, so I have to
create a separate CL for master.

Bug: 77727638
Test: it builds
Change-Id: Ib74d4c664f23a61e6fc33f700ba6a3c6fad32c74
2018-05-07 17:57:42 -07:00
Kweku Adams
71a9531806 Adding batterystats history to proto dump.
It will only print out a dump for userdebug or eng builds.

Bug: 77727638
Test: flash device and check output of incident proto and
'dumpsys batterystats -c --history'

Merged-In: Ib74d4c664f23a61e6fc33f700ba6a3c6fad32c74
Change-Id: Ia0c993d1281cc350d93f9c13f5540b349a4bfb84
2018-05-07 17:53:57 -07:00
Yao Chen
c9c242e5cf Move libstatssocket to system/ so that lmkd can build on PDK.
Bug: 79349329
Test: builds locally
Change-Id: I9e767639f39fcd317ba0d8daf353d9af3bb73359
2018-05-07 17:00:46 -07:00
Yao Chen
441d76894f Merge "Support stats log in lmkd." into pi-dev am: dcd71294a4
am: 4ea3ecbc14

Change-Id: I0df060654430e40089ca43c4b350ab5b96b1a6c2
2018-05-04 13:51:23 -07:00
Yao Chen
4ea3ecbc14 Merge "Support stats log in lmkd." into pi-dev
am: dcd71294a4

Change-Id: I2607f3f94cc74e5bddccc664acbd8f139af85151
2018-05-04 13:35:07 -07:00
Yao Chen
88e881017c Support stats log in lmkd.
This CL changes the relevant cpp files to c files. And added functionalities to reset the log
context for reuse.

Background:
+ lmkd doesn't use the generated statslog code because:
   1. lmkd doesn't want to create a 4K log context for each log. lmkd is single threaded and can
      reuse the same log context.
   2. lmkd is written in c, and the existing statslog.h/.cpp are not compatible

Bug: 78603347
Test: manually tested with alloc-stress
Change-Id: Ife6f5c69248ecf5af730269e67f229ba4c72f37f
2018-05-03 15:42:17 -07:00
Ryan Mitchell
461b3001f6 Merge "AAPT2: Fix quoted text in res/xml assets" into pi-dev am: 150bafd217
am: cc6e856522

Change-Id: Ie22b644b07da19fcc51e59529f5e38ee2f1f9137
2018-05-02 17:49:08 -07:00
Yi Jin
68a16c4277 Merge "Add a section flag to bypass failure if a specific path can't be found." into pi-dev
am: e09cde0cd9

Change-Id: I01c5a7a2c1ead02f5af0514cf9bf9b83f1682316
2018-05-02 15:10:58 -07:00
Yi Jin
e09cde0cd9 Merge "Add a section flag to bypass failure if a specific path can't be found." into pi-dev 2018-05-02 21:36:23 +00:00
Ryan Mitchell
60f06b7770 Merge "AAPT2: Fixed id parsing error" into pi-dev am: f4c089dd90
am: 932c44d329

Change-Id: I661784fcabac19d4d9bae137904b9282d9765d79
2018-05-02 13:55:05 -07:00
Ryan Mitchell
cc6e856522 Merge "AAPT2: Fix quoted text in res/xml assets" into pi-dev
am: 150bafd217

Change-Id: I5bb4a63234cf3ee022bbf59edd5b613abefd8bef
2018-05-02 13:43:45 -07:00
Ryan Mitchell
0dcb20c727 AAPT2: Fix quoted text in res/xml assets
AAPT2 aggressively processed xml nodes and regressed from the behavior
of AAPT. This change restores AAPT's processing of xml nodes with
quotations.

Bug: 71805084
Test: Created tests in XmlFlattener_test.cpp and ran the test in the
Android Studio project given in the bug

Change-Id: Idedb4f1002e9fd705ceb5feae35289235b754b02
2018-05-02 17:53:21 +00:00
Ryan Mitchell
932c44d329 Merge "AAPT2: Fixed id parsing error" into pi-dev
am: f4c089dd90

Change-Id: I81147ee8629edc98ba19565083c09d7dce8e6bf7
2018-05-02 09:42:11 -07:00
Ryan Mitchell
f4c089dd90 Merge "AAPT2: Fixed id parsing error" into pi-dev 2018-05-02 16:27:03 +00:00
Izabela Orlowska
d51efe818b AAPT2: add flag for strict visibility
Will only detect whether a resource was defined as both 'public' and
'private' (but will allow overriding 'undefined' visiblity for now).

Test: TableMerger_test + manual
Bug: 72735798

Change-Id: If0749559c91c4d8820a6286fc9ddc80209c1e5e9
2018-05-02 13:14:33 +01:00
Yi Jin
7fe3dee3ae Add a section flag to bypass failure if a specific path can't be found.
This is a temporary solution to bypass failure of reading cpu info or 
battery type in P if the path doesn't exist on some devices. See bug for
details. However in Q, incidentd should implement reading from the
common Linux kernel interfaces.

Bug: 78028767
Bug: 78239764
Test: atest incidentd_test
Change-Id: I08ffcb21709efe5478d2ac46121deb5795af1024
Merged-In: I08ffcb21709efe5478d2ac46121deb5795af1024
2018-05-02 01:31:08 +00:00
Yi Jin
3f3603587c Add a section flag to bypass failure if a specific path can't be found.
This is a temporary solution to bypass failure of reading cpu info or
battery type in P if the path doesn't exist on some devices. See bug for
details. However in Q, incidentd should implement reading from the
common Linux kernel interfaces.

Bug: 78028767
Bug: 78239764
Test: atest incidentd_test
Change-Id: I08ffcb21709efe5478d2ac46121deb5795af1024
2018-05-01 16:25:52 -07:00
Ryan Mitchell
eaf77e1d3a AAPT2: Fixed id parsing error
A previous change, editied the logic for parsing ids to allow for ids to
reference other ids. This change though caused a regression that made
ids in the form '<id name="name" />' cease to parse. This changes fixes
that regression.

Bug: 78513618
Test: Updated tests in ResourceParser_test.cpp
Change-Id: I3608bb764464e951a50910be55e199c6ec575d09
2018-05-01 11:11:55 -07:00
Todd Kennedy
0a81745b48 Merge "Allow using reserved package IDs" into pi-dev am: 13588dc9e4
am: c323122e93

Change-Id: I0addf146d9519a93bc2f8f73898a3454cb1cfb56
2018-04-26 15:27:00 -07:00
Todd Kennedy
c323122e93 Merge "Allow using reserved package IDs" into pi-dev
am: 13588dc9e4

Change-Id: If17488c1194560fce69a9bedeb1553795d415c30
2018-04-26 15:09:29 -07:00
Todd Kennedy
13588dc9e4 Merge "Allow using reserved package IDs" into pi-dev 2018-04-26 21:29:17 +00:00
Todd Kennedy
325129964e Allow using reserved package IDs
Pre-O, the platform treats negative resource IDs [those with
a package ID of 0x80 or higher] as invalid.  In order to work
around this limitation, we allow the use of traditionally
reserved resource IDs [those between 0x02 and 0x7E].

Bug: 78041707
Test: ./out/host/linux-x86/nativetest64/aapt2_tests/aapt2_tests
Test: ./out/host/linux-x86/nativetest/libandroidfw_tests/libandroidfw_tests
Test: Manual. Create a feature split with a package ID of 0x7E and see it runs and can reference base resources.

Change-Id: I3d9782cc05d3a55e1a2467bf39566788847e1160
2018-04-26 10:27:30 -07:00
Mathew Inwood
1b216d84c0 Merge "Add presubmit hook for hidden API lists." into pi-dev
am: 02033386c2

Change-Id: I6c437a6ffa62794f1fc88d0c8bcdcef798b68d8c
2018-04-24 09:47:36 -07:00
Mathew Inwood
e5dc64d428 Add presubmit hook for hidden API lists.
Check that they're sorted as expected and contain no duplicates.
The sort order now uses:
$ LC_COLLATE=C sort -f

So that non-alphanumeric characters are not ignored, giving a more
intuitive sort order. the '-f' means ignore case.

Also sort the existing lists accordingly.

Test: repo upload
Bug: 64382372
Merged-In: I52b884da33a9a46455df6747a215683d9d3c3218
Change-Id: I4cdd3bc5c11be91a9a3f678580af49ac67f3c968
2018-04-24 15:15:13 +01:00
Mathew Inwood
a10f2e2405 Add presubmit hook for hidden API lists.
Check that they're sorted as expected and contain no duplicates.
The sort order now uses:
$ LC_COLLATE=C sort -f

So that non-alphanumeric characters are not ignored, giving a more
intuitive sort order. the '-f' means ignore case.

Also sort the existing lists accordingly.

Test: repo upload
Bug: 64382372
Change-Id: I52b884da33a9a46455df6747a215683d9d3c3218
2018-04-24 15:02:22 +01:00
Todd Kennedy
4cb8826c28 Merge "Allow overriding the compile SDK" into pi-dev am: fd5166ddac
am: e31a442140

Change-Id: Iaaaee5337ba37a24d409c2e453995e314c562bce
2018-04-23 20:30:05 -07:00
Todd Kennedy
e31a442140 Merge "Allow overriding the compile SDK" into pi-dev
am: fd5166ddac

Change-Id: I53d265b82f4a0e9b86b1324900e133911a355104
2018-04-23 20:23:12 -07:00
TreeHugger Robot
fd5166ddac Merge "Allow overriding the compile SDK" into pi-dev 2018-04-24 03:14:04 +00:00
Siyamed Sinir
edcdab22c4 Merge "Update fontchain_linter for emoji 11" into pi-dev
am: 485a197ab0

Change-Id: I1388a4b0292836f492a1f0d60406c266a0c1af15
2018-04-23 11:48:54 -07:00
Siyamed Sinir
485a197ab0 Merge "Update fontchain_linter for emoji 11" into pi-dev 2018-04-23 18:19:22 +00:00
Yao Chen
c0100c1222 Merge changes from topic "statsd_socket_review" into pi-dev am: 46fca44ee5
am: 3585804c70

Change-Id: I97f951a53f7d0466be48c521a58ac77b3616145a
2018-04-20 20:33:43 -07:00