7161 Commits

Author	SHA1	Message	Date
TreeHugger Robot	2e410d6942	Merge "Initialize nested to true" into rvc-dev am: b96e3e317b am: 46771a3c9a am: cbbe63089d am: 1777f0e916 ... Change-Id: I5c75c852180f66f67be09d14b1eb8a037aec516f	2020-04-08 01:36:09 +00:00
TreeHugger Robot	cbbe63089d	Merge "Initialize nested to true" into rvc-dev am: b96e3e317b am: 46771a3c9a ... Change-Id: I65f511df960b56fffeaffe4db35965d4e7baebfa	2020-04-08 01:07:43 +00:00
Muhammad Qureshi	79e10620ee	Initialize nested to true ... This fixes random nested values in atoms_info. Bug: 153119080 Test: m libstatsmetadata Change-Id: I1c1900dae1701b28a8db6ee257f5730e71e574eb	2020-04-07 07:23:21 -07:00
TreeHugger Robot	88f45e5a6f	Merge "Make state_option top-level boolean annotations" into rvc-dev am: 4e83de27c2 am: 91360dfec1 am: 395dd7ea13 am: 763c503ad7 ... Change-Id: I69f9a23c00c4c84fcc96127d95f6451e7d74c50c	2020-04-04 06:00:53 +00:00
TreeHugger Robot	395dd7ea13	Merge "Make state_option top-level boolean annotations" into rvc-dev am: 4e83de27c2 am: 91360dfec1 ... Change-Id: Ide0f5b4dab0f57e71a825d0d9499a8444f91303e	2020-04-04 05:49:07 +00:00
Muhammad Qureshi	3f9c330eef	Make state_option top-level boolean annotations ... - Add AnnotationId enum stats-log-api-gen - Rename RESET_STATE annotation to TRIGGER_STATE_RESET. Also rename the proto annotation. Bug: 152412767 Test: stats-log-api-gen-test Test: m statslog-framework-java-gen Change-Id: I2c12ea0b9222ef28b8cc11ea36b272e518a96259	2020-04-03 17:00:55 -07:00
Mohamed Heikal	537e4e8b85	Merge "Enable --collapse-resource-names on bundles"	2020-04-02 21:21:04 +00:00
Automerger Merge Worker	5aa6901bac	Merge "Merge "Use constant names instead of literals" into rvc-dev am: 5a06bb22e5 am: d547a0988c" into rvc-d1-dev-plus-aosp am: 56bff98a99 am: 7ded7628b2 ... Change-Id: Ied40d0ea21730d4e2baff0d62626da574027f84e	2020-04-02 19:33:43 +00:00
Muhammad Qureshi	f3383d6119	Merge "Use constant names instead of literals" into rvc-dev am: 5a06bb22e5 am: d547a0988c ... Change-Id: I7c331b6c579266367183dc61104ebe87e821a8a8	2020-04-02 14:25:16 +00:00
Muhammad Qureshi	4b141386b0	Use constant names instead of literals ... Use constant names instead of literals when writing annotations to increase readability. FrameworkStatsLog.java: https://paste.googleplex.com/4789132691767296 statslog.h: https://paste.googleplex.com/4986214782337024 statslog.cpp: https://paste.googleplex.com/4856851575341056 Bug: 151786433 Test: m statslog-framework-java-gen Test: m libstatslog Change-Id: I47111fe02319bebf41f429642fb675f7a856710b	2020-03-31 17:52:07 -07:00
Mohamed Heikal	e0388de6be	Enable --collapse-resource-names on bundles ... This cl enables aapt2 optimize and convert to handle collapsed resource names optimization. Test: make aapt2_test Change-Id: I160d7e5bbd94580b52c00b648918e47beb4674f1	2020-03-31 14:58:01 -04:00
TreeHugger Robot	3dbeeda343	Merge changes I6f6b4d78,I874696cf into rvc-dev am: b7df0eb9a6 am: aa97f74ee9 am: 80f27f12c7 am: e3c6e1700b am: 1405484874 ... Change-Id: I369cc1852f543a1ce4308b3bb754096d5f1d8366	2020-03-31 01:03:20 +00:00
Narayan Kamath	ca96d07baf	Merge "aapt2: Preserve annotation parameters for SystemApi." into rvc-dev am: 924069c2aa am: d7bc5846b6 am: 6edf7daeec am: 798ee20e2b am: 124e0a4f2a ... Change-Id: I9a5cd8f4023299cf9430cf3389ed9b372b326ec2	2020-03-31 00:18:24 +00:00
TreeHugger Robot	b0afe4a034	Merge changes I6f6b4d78,I874696cf into rvc-dev am: b7df0eb9a6 am: aa97f74ee9 ... Change-Id: I6241535a47320e8be7a64a2f14d83f0417944bac	2020-03-30 19:01:52 +00:00
Narayan Kamath	ebc528a617	Merge "aapt2: Preserve annotation parameters for SystemApi." into rvc-dev am: 924069c2aa am: d7bc5846b6 ... Change-Id: Ib039eb459083589d97b5d999a76c590c3fa89603	2020-03-30 19:01:25 +00:00
TreeHugger Robot	1405484874	Merge changes I6f6b4d78,I874696cf into rvc-dev am: b7df0eb9a6 am: aa97f74ee9 am: 80f27f12c7 am: e3c6e1700b ... Change-Id: I1def885b08c45f9526dfc540ae178d87e4c89e19	2020-03-30 18:16:04 +00:00
Narayan Kamath	124e0a4f2a	Merge "aapt2: Preserve annotation parameters for SystemApi." into rvc-dev am: 924069c2aa am: d7bc5846b6 am: 6edf7daeec am: 798ee20e2b ... Change-Id: I6d95f80ba27bd4c028fc490fe14dacf136ee8a12	2020-03-30 18:15:43 +00:00
TreeHugger Robot	b7df0eb9a6	Merge changes I6f6b4d78,I874696cf into rvc-dev ... * changes: Only send reset state annotation when needed Group annotations for the same atom id	2020-03-30 13:22:29 +00:00
Narayan Kamath	924069c2aa	Merge "aapt2: Preserve annotation parameters for SystemApi." into rvc-dev	2020-03-30 13:16:06 +00:00
Muhammad Qureshi	23daf2656c	Only send reset state annotation when needed ... Only send reset state annotation when reset state occurs. Bug: 151776731 Test: m libstatslog Change-Id: I6f6b4d784d3741c0059085421565eba81db5527c	2020-03-27 02:23:38 -07:00
Muhammad Qureshi	c6c38632af	Group annotations for the same atom id ... Group annotations for the same atom id inside one if-block in generated code. Use shared_ptr to store AtomDecls in multiple data structures. Store a mapping of field numbers to atoms that have annotations at corresponding field numbers in Collation.h Bug: 151744250 Test: stats-log-api-gen-test Test: m stats-log-api-gen Test: m libstatsmetadata Test: m statslog-framework-java-gen Test: m libstatslog Change-Id: I874696cfb5c27141017b4293bec809ab510ceb98	2020-03-26 14:51:28 -07:00
Narayan Kamath	1c1544ff96	aapt2: Preserve annotation parameters for SystemApi. ... SystemAPI can now be parameterized. Note that this change preserves the content of the annotation params without attempting to interpret them in any way. This means that references to types outside of java.lang must be fully qualified. Test: atest aapt2_tests Bug: 147581540 Change-Id: I0630fb1c7c7a7f5918ff2dca32fb8e078b367751	2020-03-26 11:47:59 +00:00
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