Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
500,724 Commits 3 Branches 0 Tags
044ae31ea4d609c1d97671ec4b23cece2e4cd3d8
Commit Graph

7139 Commits

Author SHA1 Message Date
Muhammad Qureshi
5bf6251d1b Merge changes Iad76baea,I3db5f4ff into rvc-dev am: 6fe5fd6e2e am: e440df36bb am: 6604c0361c am: a5b148b95f 
Change-Id: I0613879248c753dd1af216ed6b9d605dfc3da29d
 2020-03-25 18:20:20 +00:00
Muhammad Qureshi
e440df36bb Merge changes Iad76baea,I3db5f4ff into rvc-dev am: 6fe5fd6e2e 
Change-Id: Ibd751ce32cc1ed3bec08712bf019af81fc595985
 2020-03-25 17:40:28 +00:00
Muhammad Qureshi
a345af9b40 Run clang-format in stats_log_api_gen 
Bug: 152253223
Test: m stats-log-api-gen
Test: stats-log-api-gen-test
Change-Id: Iad76baea8cc9ae7b3978f1133ab94d8e96bbbafe
 2020-03-24 17:35:08 -07:00
Muhammad Qureshi
9b995809fb Add truncate_timestamp annotation 
Mark privacy-sensitive atoms with truncate_timestamp annotation.

Factor out annotation collation to a helper method.

Add truncate_timestamp annotation support in stats-log-api-gen.

Add writeAnnotation* calls in Java and native generated code for
atom id annotations.

TODO: remove kTruncatingTimestampAtoms from atoms_info.
TODO: use truncate_timestamp annotation inside statsd.

Bug: 151111680
Test: stats-log-api-gen-test
Test: m statslog-framework-java-gen
Test: m libstatsmetadata

Change-Id: I3db5f4ffbf959bd36c62f890cc88606912798d40
 2020-03-24 16:49:36 -07:00
Muhammad Qureshi
fbdaf5a7b9 Merge "Remove kBytesFieldAtoms from atoms_info" into rvc-dev am: 4d57eccd1d am: 01a94e2a02 am: 5ea01d28d8 am: a8bf09ed89 am: 7654cd6c10 
Change-Id: Ia1e48b6da18669341c232094c1a1c77c50db987d
 2020-03-20 21:42:26 +00:00
Muhammad Qureshi
7654cd6c10 Merge "Remove kBytesFieldAtoms from atoms_info" into rvc-dev am: 4d57eccd1d am: 01a94e2a02 am: 5ea01d28d8 am: a8bf09ed89 
Change-Id: I596a6227eaa5c636e73b2a0384fcb18d6c502ce3
 2020-03-20 21:28:12 +00:00
Muhammad Qureshi
1d2db67a47 Merge "Remove kBytesFieldAtoms from atoms_info" into rvc-dev am: 4d57eccd1d 
Change-Id: I60acd645c7cd139c19fb09a282b2ac1ea5ced44e
 2020-03-20 20:47:01 +00:00
Muhammad Qureshi
f77913fbc6 Remove kBytesFieldAtoms from atoms_info 
Bug: 150415347
Test: m
Test: bit statsd_test:*
Change-Id: I2e55b445121a39e3bf12164cd9123561e8b5bd4c
 2020-03-20 10:55:46 -07:00
TreeHugger Robot
76750266cd Merge "Fix aapt2 Maybe check" 2020-03-20 03:23:36 +00:00
Muhammad Qureshi
3be14f12ce Merge "StatsEvent annotations java autogen" into rvc-dev am: 29613e8ff8 am: 3331ec8b53 am: b64fbe8d62 am: 41f47c3156 
Change-Id: I7941f2b81b1bf74c861507bfa68a666a5e5b536b
 2020-03-19 18:08:56 +00:00
Automerger Merge Worker
f09ad3cc82 Merge "Merge "Write annotations in native generated code." into rvc-dev am: 38bdeb5977 am: cfd5fad10b am: e1c32ea0e2" into rvc-qpr-dev-plus-aosp am: aaee6624a9 
Change-Id: I64e02b334e47166848d3fcdea106b2b389f23bd3
 2020-03-19 18:08:45 +00:00
Muhammad Qureshi
8ba942b703 Merge "Store annotation during collation" into rvc-dev am: 8a69088a36 am: c5cab8fb4f am: 1c7aa7bc0a am: 73c821b93e 
Change-Id: Ib5b643ed330307be83a2934612572452d9f556dc
 2020-03-19 18:08:18 +00:00
Muhammad Qureshi
b64fbe8d62 Merge "StatsEvent annotations java autogen" into rvc-dev am: 29613e8ff8 am: 3331ec8b53 
Change-Id: I2c29582190fcd7116e28332e8181e1db55f41b6a
 2020-03-19 17:33:20 +00:00
Muhammad Qureshi
e1c32ea0e2 Merge "Write annotations in native generated code." into rvc-dev am: 38bdeb5977 am: cfd5fad10b 
Change-Id: Icb75535ee7901885f9bceb7590f69ceb30926436
 2020-03-19 17:33:01 +00:00
Muhammad Qureshi
1c7aa7bc0a Merge "Store annotation during collation" into rvc-dev am: 8a69088a36 am: c5cab8fb4f 
Change-Id: Ib7250c253b346b2074d8ea52f4095e5ddbd89a97
 2020-03-19 17:32:48 +00:00
Muhammad Qureshi
03ac19b3b9 Merge "StatsEvent annotations java autogen" into rvc-dev am: 29613e8ff8 
Change-Id: I118cfb16c5f2b42e51e800f78460f15d0863cecf
 2020-03-19 17:26:08 +00:00
Muhammad Qureshi
9c11c2fbc1 Merge "Write annotations in native generated code." into rvc-dev am: 38bdeb5977 
Change-Id: Ic9b8317ac89d3e375bebac233b410374063ccd5e
 2020-03-19 17:25:54 +00:00
Muhammad Qureshi
c29dff126c Merge "Store annotation during collation" into rvc-dev am: 8a69088a36 
Change-Id: Idd070ae01bcf2c895d9e0dbdb4cf82425f06f8e3
 2020-03-19 17:25:23 +00:00
Muhammad Qureshi
29613e8ff8 Merge "StatsEvent annotations java autogen" into rvc-dev 2020-03-19 17:20:19 +00:00
Muhammad Qureshi
38bdeb5977 Merge "Write annotations in native generated code." into rvc-dev 2020-03-19 17:19:50 +00:00
Muhammad Qureshi
8a69088a36 Merge "Store annotation during collation" into rvc-dev 2020-03-19 17:19:27 +00:00
Jeffrey Huang
f960305a31 StatsEvent annotations java autogen 
Autogenerate annotations for atoms logged in java.

generated FrameworkStatsLog.java:
https://paste.googleplex.com/4789132691767296

Bug: 151102209
Test: m stats-log-api-gen
Test: m statslog-framework-java-gen
Change-Id: I50b01feaacfcb8ad5d0236432ceb0e97c8c907ab
 2020-03-17 22:01:58 -07:00
Muhammad Qureshi
a31a6229dd Write annotations in native generated code. 
Generated statslog.cpp: https://paste.googleplex.com/6345695252447232

Bug: 151101995
Test: m stats-log-api-gen
Test: m libstatslog
Change-Id: I745a9beb7be07a1890f811256c51627e6c5976dc
 2020-03-17 21:57:35 -07:00
Muhammad Qureshi
b13a3214a1 Store annotation during collation 
- Only collate atoms in the specified module.

- Replace signature_to_modules with signatureInfoMap. This maps each
signature to another map keyed by field number and whose values are vector of
annotations.

Bug: 151102006
Test: stats-log-api-gen-test
Change-Id: I25bbe4883c8f7f86a06d04d27cd425367b6d65a0
 2020-03-17 20:19:04 -07:00
Automerger Merge Worker
be7b8b0f38 Merge "Fix bugprone-copy-constructor-init warnings" am: 4dc2f8f773 am: 87158910b0 am: a4e3d254b5 am: df05de4afa am: cb3745e54f 
Change-Id: I21d332876304e1a789139b8d84285eb716a766ca
 2020-03-17 20:53:04 +00:00
Automerger Merge Worker
a4e3d254b5 Merge "Fix bugprone-copy-constructor-init warnings" am: 4dc2f8f773 am: 87158910b0 
Change-Id: I6845ad403b8b7c4572053fc49998ed5e7c01c6be
 2020-03-17 19:55:19 +00:00
Roderick Sheeter
04506f834b Merge "Update fontchain_lint to print all coverage errors, not just first." 2020-03-17 03:57:58 +00:00
Rod S
e34a19d7a6 Update fontchain_lint to print all coverage errors, not just first. 
Test: m fontchain_lint
Change-Id: Ib6c462b91cbb70cc45701efbadd7b1ac63715c09
 2020-03-16 00:01:15 -07:00
Philip P. Moltmann
12ac3f406f Rename featureId -> attributionTag 
In the core functionality this changes everything including aidl's and
field names:
- Context
- ContentProvider
- AppOps*
- Package parsing

For the rest, this is a shallow change to only change to the changed
APIs. This keeps the change small-ish

Exempt-From-Owner-Approval: Rename
Fixes: 148792795
Test: TH
Change-Id: I2a2245fe76e09e62cb13d5785d2efb4a304ba54a
Merged-In: I2a2245fe76e09e62cb13d5785d2efb4a304ba54a
 2020-03-12 19:26:10 +00:00
Philip P. Moltmann
aea50fc06a Rename featureId -> attributionTag 
In the core functionality this changes everything including aidl's and
field names:
- Context
- ContentProvider
- AppOps*
- Package parsing

For the rest, this is a shallow change to only change to the changed
APIs. This keeps the change small-ish

Exempt-From-Owner-Approval: Rename
Fixes: 148792795
Test: TH
Change-Id: I2a2245fe76e09e62cb13d5785d2efb4a304ba54a
Merged-In: I2a2245fe76e09e62cb13d5785d2efb4a304ba54a
 2020-03-12 11:47:51 -07:00
Philip P. Moltmann
8a06c2870e Rename featureId -> attributionTag 
In the core functionality this changes everything including aidl's and
field names:
- Context
- ContentProvider
- AppOps*
- Package parsing

For the rest, this is a shallow change to only change to the changed
APIs. This keeps the change small-ish

Exempt-From-Owner-Approval: Rename
Fixes: 148792795
Test: TH
Change-Id: I2a2245fe76e09e62cb13d5785d2efb4a304ba54a
 2020-03-11 23:52:32 +00:00
Automerger Merge Worker
27c41e465f Merge "Remove apex_available from libstatslog" into rvc-dev am: 75274ad0fa am: 924a52d877 
Change-Id: I74e3a4be3c27b31bfe5d216d4185f1dbc0ea8e9c
 2020-03-11 05:39:41 +00:00
Automerger Merge Worker
6fb9bbacc8 Merge "Remove apex_available from libstatslog" into rvc-dev am: 75274ad0fa 
Change-Id: I2bccd7c25546f6e7ce7bd038e0002843f72af1ae
 2020-03-11 05:31:53 +00:00
Jeffrey Huang
74fc4354b5 Remove apex_available from libstatslog 
Test: m -j
Bug: 149781190
Change-Id: I765852b1719a3056c06a0965ea6a05a8e8410693
 2020-03-10 15:14:27 -07:00
Chih-Hung Hsieh
3fb38f7fe2 Fix bugprone-copy-constructor-init warnings 
* normally a copy constructor should call base copy constructor

Bug: 151109313
Test: WITH_TIDY=1 make
Change-Id: I9677889973178c26cd787a457333877619956b51
 2020-03-10 12:58:29 -07:00
Automerger Merge Worker
578f3a9037 Merge "Suppress bugprone-use-after-move warnings" am: 100a6f64e5 am: a4f123ba5f 
Change-Id: Iabb0a0570f64d39844758d4313d009b380aba356
 2020-03-09 03:28:19 +00:00
Chih-hung Hsieh
100a6f64e5 Merge "Suppress bugprone-use-after-move warnings" 2020-03-09 02:48:04 +00:00
Automerger Merge Worker
a23cea2545 Merge "Uses python3 for fontTools" am: 3cab05992c am: b3ef09e5de 
Change-Id: I5de75b9d07bcbfd0e5ddf71023469a7a160115b0
 2020-03-07 06:39:28 +00:00
Haibo Huang
715857dbda Uses python3 for fontTools 
Change-Id: I33bb8881823278c990faeb1a0e119f855c9948b9
 2020-03-07 02:02:19 +00:00
Automerger Merge Worker
32fedd8fe8 Merge "Generate @NonNull setter args and @MaySetToNull to opt out" into rvc-dev am: 8f562219c8 
Change-Id: I464a488dee61ef60b450d709a3c88fa66f9a783b
 2020-03-06 18:54:35 +00:00
Eugene Susla
8f562219c8 Merge "Generate @NonNull setter args and @MaySetToNull to opt out" into rvc-dev 2020-03-06 18:53:24 +00:00
Chih-Hung Hsieh
7a616f65d6 Suppress bugprone-use-after-move warnings 
Bug: 150783499
Test: WITH_TIDY=1 make
Change-Id: Ifdd5d89d2207caba765e8f74e8a86f6b6b4ff609
 2020-03-06 10:04:30 -08:00
Automerger Merge Worker
4032713a5b Merge "Remove libstatslog from libstatsmetadata" into rvc-dev am: d7944d6573 
Change-Id: If7501c97164b9d867f430c8b93bec672dcbcf053
 2020-03-06 10:25:21 +00:00
Automerger Merge Worker
88f527d2d6 Merge "Support multiple module annotations per atom" into rvc-dev am: 513453c253 
Change-Id: Idc8958ebe0cf4c1c170a217778fece4319bf7cbf
 2020-03-06 10:25:02 +00:00
Automerger Merge Worker
9d3aa9ec4f Merge "Delete unused code in stats-log-api-gen" into rvc-dev am: 4341dbb253 
Change-Id: Ibb57de15c0eebb2cb5f19811b331e6b6ef9703ce
 2020-03-06 09:47:01 +00:00
Muhammad Qureshi
d7944d6573 Merge "Remove libstatslog from libstatsmetadata" into rvc-dev 2020-03-06 08:04:46 +00:00
Muhammad Qureshi
513453c253 Merge "Support multiple module annotations per atom" into rvc-dev 2020-03-06 08:04:09 +00:00
Muhammad Qureshi
9e0f728fe4 Remove libstatslog from libstatsmetadata 
Instead of relying on the constants in libstatslog, hardcode them in
atoms_info to get rid of the dependency on libstatslog

New generated atoms_info.cpp:
https://paste.googleplex.com/5779947622760448

Bug: 150417465
Test: m libstatsmetadata
Change-Id: I954c963f1883f889053b63d308c648548de71e56
 2020-03-05 17:20:58 -08:00
Automerger Merge Worker
dc5de7b23b Merge "Generate "keep" rules for android:name and class attributes" am: a13d7fc861 am: 4da226a984 
Change-Id: I4443b84896684ac3249108316487035319b4f52e
 2020-03-06 00:56:33 +00:00
Eugene Susla
47ca5d035e Generate @NonNull setter args and @MaySetToNull to opt out 
Bug: 143653080
Test: source /usr/local/google/home/eugenesusla/android2/master/frameworks/base/tests/Codegen/runTest.sh
Change-Id: Iba8da34c91fd09e266429ab131add1d53449506b
(cherry picked from commit ab14c55c1f)
 2020-03-05 23:54:43 +00:00