OSDN Git Service
Yabin Cui [Wed, 18 Sep 2019 01:01:10 +0000 (18:01 -0700)]
Merge "simpleperf: use path in binary_cache in pprof_proto_generator.py." am:
f0988974b0
am:
1d0136f68b
Change-Id: Ib000930636fd16ab379de72a8eb20ab2b1d88e19
Yabin Cui [Wed, 18 Sep 2019 00:54:18 +0000 (17:54 -0700)]
Merge "simpleperf: use path in binary_cache in pprof_proto_generator.py."
am:
f0988974b0
Change-Id: Ia602ea561bf73d39691bcb21918efe3aebe577dc
Yabin Cui [Wed, 18 Sep 2019 00:31:37 +0000 (00:31 +0000)]
Merge "simpleperf: use path in binary_cache in pprof_proto_generator.py."
Yabin Cui [Tue, 17 Sep 2019 23:01:01 +0000 (16:01 -0700)]
simpleperf: use path in binary_cache in pprof_proto_generator.py.
Pprof needs to know binary paths to show their disassembly code.
So support it by generating path in binary_cache instead of
path on Android device.
Bug:
141026312
Test: run test.py.
Change-Id: Ied2913b99d884bfa57ab9440ae1684b1d9d6a31d
Yabin Cui [Tue, 17 Sep 2019 22:23:14 +0000 (15:23 -0700)]
Merge "simpleperf: fix build id in pprof_proto_generator.py." am:
939a46d25c
am:
22ed5013c6
Change-Id: I4e67c0b35ca95f161ea1458c877dae1725ac2f67
Yabin Cui [Tue, 17 Sep 2019 22:17:27 +0000 (15:17 -0700)]
Merge "simpleperf: fix build id in pprof_proto_generator.py."
am:
939a46d25c
Change-Id: I694d9b6f0621103a3309d91b6accd831b26adc5d
Yabin Cui [Tue, 17 Sep 2019 21:55:25 +0000 (21:55 +0000)]
Merge "simpleperf: fix build id in pprof_proto_generator.py."
Yabin Cui [Tue, 17 Sep 2019 19:25:43 +0000 (12:25 -0700)]
simpleperf: fix build id in pprof_proto_generator.py.
Simpleperf stores padded build id in perf.data, but pprof needs
real build ids in proto file. So we need to convert from padded
build ids to real build ids.
Bug:
141026312
Test: run test.py.
Change-Id: I7f4454343fd80f77364b67ec729cfba478925029
Paul Crowley [Tue, 17 Sep 2019 06:07:00 +0000 (23:07 -0700)]
Merge "Add a per-boot-key policy reference" am:
8b3bcfa42b
am:
d59c0c14dc
Change-Id: I4e706b36d5fef5465ca3a553be887e382c451299
Paul Crowley [Tue, 17 Sep 2019 06:01:04 +0000 (23:01 -0700)]
Merge "Add a per-boot-key policy reference"
am:
8b3bcfa42b
Change-Id: If3093b98587a1f81ce3affbacff0d022faf4788b
Paul Crowley [Tue, 17 Sep 2019 05:40:05 +0000 (05:40 +0000)]
Merge "Add a per-boot-key policy reference"
Paul Crowley [Wed, 11 Sep 2019 21:57:45 +0000 (14:57 -0700)]
Add a per-boot-key policy reference
Bug:
140882488
Test: Booted twice, checked logs to ensure encryption
is different each time, adb created files in directory.
Change-Id: I5c962edb316d160dd09c0df893912c6b257d7810
David Anderson [Thu, 12 Sep 2019 21:23:05 +0000 (14:23 -0700)]
Merge "lpdump: Fix slot handling on retrofit devices." am:
18dea93474
am:
69ec319cb8
Change-Id: I358769b3885c44c71852cb1b97389c3dafefa4ee
David Anderson [Thu, 12 Sep 2019 21:15:57 +0000 (14:15 -0700)]
Merge "lpdump: Fix slot handling on retrofit devices."
am:
18dea93474
Change-Id: Ibeb8c81fc888bc99b15eb8dd027bddf903d71b66
David Anderson [Thu, 12 Sep 2019 20:54:34 +0000 (20:54 +0000)]
Merge "lpdump: Fix slot handling on retrofit devices."
Tianjie Xu [Wed, 11 Sep 2019 19:37:21 +0000 (12:37 -0700)]
Merge "verity: Do not increment data when it is nullptr." am:
49558ddfbd
am:
d4f17daa98
Change-Id: I7eb488773bf1ecbf5b382e4e35fea6fcea8fa5af
Tianjie Xu [Wed, 11 Sep 2019 19:30:25 +0000 (12:30 -0700)]
Merge "verity: Do not increment data when it is nullptr."
am:
49558ddfbd
Change-Id: I91e75c5e35eba10d44a1814e580c51459fcafb2b
Tianjie Xu [Wed, 11 Sep 2019 19:11:34 +0000 (19:11 +0000)]
Merge "verity: Do not increment data when it is nullptr."
Colin Cross [Wed, 11 Sep 2019 19:10:09 +0000 (12:10 -0700)]
Merge changes from topic "protobuf-3.9.1" am:
dfe1e15650
am:
e9b0e7aada
Change-Id: I026ff34bc50ed37b5c6a1261fe6da9c926eff585
Colin Cross [Wed, 11 Sep 2019 19:10:00 +0000 (12:10 -0700)]
Adapt to google::protobuf::int64 type change and scoped_ptr removal am:
43b95eae1e
am:
c8dc8c0bbf
Change-Id: I97dc85eb9a811d0be493387f0070bab81a12a792
Colin Cross [Wed, 11 Sep 2019 18:46:44 +0000 (11:46 -0700)]
Merge changes from topic "protobuf-3.9.1"
am:
dfe1e15650
Change-Id: I8e2bb0d9c095b9aa9f6f435d31c8b4770437f8dc
Colin Cross [Wed, 11 Sep 2019 18:46:33 +0000 (11:46 -0700)]
Adapt to google::protobuf::int64 type change and scoped_ptr removal
am:
43b95eae1e
Change-Id: I7771ad00341e37660c4803bcb33ab4afa2331404
Colin Cross [Wed, 11 Sep 2019 18:00:16 +0000 (18:00 +0000)]
Merge changes from topic "protobuf-3.9.1"
* changes:
libjsonpb: fix tests for new protobuf version
Adapt to google::protobuf::int64 type change and scoped_ptr removal
Pirama Arumuga Nainar [Wed, 11 Sep 2019 04:28:55 +0000 (21:28 -0700)]
Merge "Create per-uid GCOV_PREFIX dir in the getenv wrapper" am:
54451c0c7b
am:
043e063458
Change-Id: Id0d29c78ff1c36bd2bfedc4797817c656195dcc2
Pirama Arumuga Nainar [Wed, 11 Sep 2019 04:23:01 +0000 (21:23 -0700)]
Merge "Create per-uid GCOV_PREFIX dir in the getenv wrapper"
am:
54451c0c7b
Change-Id: Ibc3d667bf1cc6ec5bf0e8e7ec109143c8fbc2aa3
Treehugger Robot [Wed, 11 Sep 2019 03:54:13 +0000 (03:54 +0000)]
Merge "Create per-uid GCOV_PREFIX dir in the getenv wrapper"
Pirama Arumuga Nainar [Fri, 26 Jul 2019 21:49:58 +0000 (14:49 -0700)]
Create per-uid GCOV_PREFIX dir in the getenv wrapper
Bug: http://b/
116873221
With https://reviews.llvm.org/D65245, the profile runtime assumes that
the directory ${GCOV_PREFIX} is already created. Before returning from
the getenv wrapper, create the per-uid ${GCOV_PREFIX}.
Test: cuttlefish builds and boots with new Clang.
Change-Id: I276e1a92b3cb18ee85bb4451159b131d8ebca4a2
David Anderson [Tue, 10 Sep 2019 22:07:54 +0000 (15:07 -0700)]
Merge changes from topics "lpdump-all", "lpdump-bugreport" am:
2cf1c60a8c
am:
a5e3b273a4
Change-Id: I4cf43e540c11029a3b04ebac084b38a7eafb16a5
David Anderson [Tue, 10 Sep 2019 22:01:44 +0000 (15:01 -0700)]
Merge changes from topics "lpdump-all", "lpdump-bugreport"
am:
2cf1c60a8c
Change-Id: I96ddbe6cf8a067230f638f8db2c89e6647795272
David Anderson [Tue, 10 Sep 2019 21:36:39 +0000 (21:36 +0000)]
Merge changes from topics "lpdump-all", "lpdump-bugreport"
* changes:
lpdump: Add an --all command to dump all metadata slots.
lpdump: Refactor how lpdump reads metadata.
David Anderson [Fri, 6 Sep 2019 01:53:21 +0000 (18:53 -0700)]
lpdump: Fix slot handling on retrofit devices.
On retrofit devices, use the correct super partition when none is
explicitly specified.
Bug:
140204341
Test: manual test
Change-Id: I2753024bd2e7dfdf9d19916f30c1b2bd6b5ee289
David Anderson [Fri, 6 Sep 2019 01:31:12 +0000 (18:31 -0700)]
lpdump: Add an --all command to dump all metadata slots.
Note that this will not correctly dump all slots on retrofit devices.
Bug:
140204341
Test: lpdump --all
Change-Id: Icb8d8619202221f0c5fc8848abc7172d0b4dafd3
MarijnS95 [Mon, 9 Sep 2019 13:50:43 +0000 (15:50 +0200)]
verity: Do not increment data when it is nullptr.
Address a segfault introduced in
d6dc877032c65768b3c6737156d3142f32cc9984
As soon as leftover_ becomes non-empty, the data pointer is incremented
and will now be an invalid pointer in case it was null previously.
The subsequent check in HashBlocks() will now encounter a non-null data
ptr and pass it to HashBlock(), triggering a segfault.
Test: Manually build and boot an image on which this crashed before.
Test: build_verity_tree_test
Change-Id: I324ff6103c9d35fb290c4e96fb5009ee365a0249
Signed-off-by: MarijnS95 <marijns95@gmail.com>
(cherry picked from commit
c82514bd034f214b16d273b10c676dd63a9e603b)
Xin Li [Sun, 8 Sep 2019 22:49:31 +0000 (15:49 -0700)]
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (
5817612) into stage-aosp-master
am:
bcb8040443 -s ours
am skip reason: change_id I96bc50d90bef5cbe55acbb773436fe21129e25ab with SHA1
120a516cb9 is in history
Change-Id: Idb388e5732e7d0ca96c53fdcb0d79f6409864c82
Xin Li [Sun, 8 Sep 2019 19:45:55 +0000 (12:45 -0700)]
Merge qt-r1-dev-plus-aosp-without-vendor (
5817612) into stage-aosp-master
No content change.
Bug:
135460123
Change-Id: I9f7a8d2543c671439b7bc53af638716ebbd060c0
Merged-In: I96bc50d90bef5cbe55acbb773436fe21129e25ab
Steven Moreland [Fri, 6 Sep 2019 21:29:43 +0000 (14:29 -0700)]
Merge "Remove libhwbinder/libhidltransport deps" am:
96974c3401
am:
120a516cb9
Change-Id: I48b6fca5056229e5942cc77baaba83dc603ea9cb
Steven Moreland [Fri, 6 Sep 2019 19:52:52 +0000 (12:52 -0700)]
Merge "Remove libhwbinder/libhidltransport deps"
am:
96974c3401
Change-Id: I96bc50d90bef5cbe55acbb773436fe21129e25ab
Steven Moreland [Fri, 6 Sep 2019 19:33:29 +0000 (19:33 +0000)]
Merge "Remove libhwbinder/libhidltransport deps"
David Anderson [Fri, 6 Sep 2019 00:57:20 +0000 (17:57 -0700)]
lpdump: Refactor how lpdump reads metadata.
This patch prepares lpdump for the addition of an "--all" option to dump
all metadata slots.
- The slot and super partition name are now determined ahead of time,
rather than as part of reading metadata.
- The custom IPartitionOpener has been removed as it served no purpose.
- The -e option has been removed in favor of IsEmptySuperImage().
- Metadata spew has been factored into a separate function.
Bug:
140204341
Test: manual test
Change-Id: I810a5f042870f7e072a8939bebe99b8707235f43
Eric Biggers [Fri, 6 Sep 2019 00:18:42 +0000 (17:18 -0700)]
Merge changes I51ee7070,I499a70a9 am:
59e1ab234c am:
c51f4867ca
am:
61aae5f8b6
Change-Id: I7ab89d80456abce9c33cc6558e2791c7bb85a932
Eric Biggers [Fri, 6 Sep 2019 00:12:06 +0000 (17:12 -0700)]
Merge changes I51ee7070,I499a70a9 am:
59e1ab234c
am:
c51f4867ca
Change-Id: I694af6956575f289820ba25a34ae1fc08d6be289
Eric Biggers [Thu, 5 Sep 2019 23:48:16 +0000 (16:48 -0700)]
Merge changes I51ee7070,I499a70a9
am:
59e1ab234c
Change-Id: I86d5c8b423f26c3a965bedad59753d374d137306
Xin Li [Thu, 5 Sep 2019 23:00:00 +0000 (16:00 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am:
3342738e82 -s ours am:
cf1093b672 -s ours
am:
fd7ac60f4b
Change-Id: I6b678f679714644a48f0cb97dc42c7cd001dccd9
Eric Biggers [Thu, 5 Sep 2019 22:51:17 +0000 (22:51 +0000)]
Merge changes I51ee7070,I499a70a9
* changes:
libfscrypt: simplify fscrypt_policy_ensure()
libfscrypt: remove some hardcoded definitions
Xin Li [Thu, 5 Sep 2019 22:50:52 +0000 (15:50 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am:
3342738e82 -s ours
am:
cf1093b672 -s ours
am skip reason: subject contains skip directive
Change-Id: Ief940ed38db328ea81cee83e09d43bbec56f9d8d
Xin Li [Thu, 5 Sep 2019 22:37:56 +0000 (15:37 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"
am:
3342738e82 -s ours
am skip reason: subject contains skip directive
Change-Id: I9e2672405aa2f59974a08b52107ff7aaaefda422
Colin Cross [Wed, 14 Aug 2019 00:03:15 +0000 (17:03 -0700)]
Adapt to google::protobuf::int64 type change and scoped_ptr removal
Protobuf 3.9.1 redefines google::protobuf::int64 from long long to
int64_t, which is sometimes long and sometimes long long. Use
PRId64 to print it.
scoped_ptr has been removed, use std::unique_ptr instead.
Bug:
117607748
Test: m checkbuild
Change-Id: Idfcaba262c27cf2b895a0a6ded8394c8465547e8
Merged-In: Idfcaba262c27cf2b895a0a6ded8394c8465547e8
Yifan Hong [Tue, 27 Aug 2019 20:51:42 +0000 (13:51 -0700)]
libjsonpb: fix tests for new protobuf version
Bug:
117607748
Test: atest --host libjsonpbverify_test
Change-Id: I5ce89c330d769fac10d8092734a37c26694587a2
Merged-In: I5ce89c330d769fac10d8092734a37c26694587a2
Xin Li [Thu, 5 Sep 2019 21:45:25 +0000 (14:45 -0700)]
[automerger skipped] DO NOT MERGE - Merge Android 10 into master am:
cbe369529b -s ours am:
7ed8d9fdae -s ours
am:
f84e9dfe0c
Change-Id: I0f6a3ecbea32241109d67be652aa7af523d671bf
Steven Moreland [Thu, 5 Sep 2019 21:17:28 +0000 (14:17 -0700)]
Remove libhwbinder/libhidltransport deps
Since these were combined into libhidlbase.
Bug:
135686713
Test: build only (libhwbinder/libhidltransport are empty)
Change-Id: Iea42841e537a16a302b6d425faf2c6bd511c6bad
Xin Li [Thu, 5 Sep 2019 21:07:15 +0000 (14:07 -0700)]
[automerger skipped] DO NOT MERGE - Merge Android 10 into master am:
cbe369529b -s ours
am:
7ed8d9fdae -s ours
am skip reason: subject contains skip directive
Change-Id: I346aee66b999f176db0a431686187c339b2379cf
Xin Li [Thu, 5 Sep 2019 20:28:16 +0000 (13:28 -0700)]
[automerger skipped] DO NOT MERGE - Merge Android 10 into master
am:
cbe369529b -s ours
am skip reason: subject contains skip directive
Change-Id: I76cba1e4ee0e5be64c5a16d00c691159f9022fed
Eric Biggers [Thu, 5 Sep 2019 19:18:30 +0000 (12:18 -0700)]
libfscrypt: simplify fscrypt_policy_ensure()
fscrypt_policy_ensure() sets an encryption policy if the directory is
empty, otherwise it verifies the existing encryption policy.
However, it's unnecessary to actually implement this logic in userspace,
because this is the behavior of the FS_IOC_SET_ENCRYPTION_POLICY ioctl
already. See the documentation:
https://www.kernel.org/doc/html/latest/filesystems/fscrypt.html#setting-an-encryption-policy
Therefore, just call FS_IOC_SET_ENCRYPTION_POLICY and handle errors
appropriately.
This makes the code shorter and less racy, and it also fixes the issue
where if files were created in the directory before an encryption policy
is set, the error message was confusing:
Failed to get encryption policy for $dir: No data available
Now it's:
Failed to set encryption policy of $dir to ...: Directory not empty
Test: booted after factory reset, checked log, rebooted, checked log
again.
Change-Id: I51ee70706bc9ccb216ccefd7bdfbbfc57faae14d
Eric Biggers [Thu, 5 Sep 2019 19:18:29 +0000 (12:18 -0700)]
libfscrypt: remove some hardcoded definitions
FS_ENCRYPTION_MODE_ADIANTUM and FS_POLICY_FLAG_DIRECT_KEY are in
Bionic's <linux/fs.h> now, so there's no need to define them in
libfscrypt anymore.
Test: compiled
Change-Id: I499a70a9f8fd3445098a1dd799b1aefe0fa374ce
Yabin Cui [Thu, 5 Sep 2019 17:12:04 +0000 (10:12 -0700)]
Merge "simpleperf: support profiling art interpreter on linux host." am:
749f0bac4a am:
6c09d89eef
am:
559a55d209
Change-Id: I6e308f61fa274c65076032d1ca22b763079231b7
Yabin Cui [Thu, 5 Sep 2019 17:06:08 +0000 (10:06 -0700)]
Merge "simpleperf: support profiling art interpreter on linux host." am:
749f0bac4a
am:
6c09d89eef
Change-Id: If3c3accc9a27319ef02251f605afcb592f21f219
Yabin Cui [Thu, 5 Sep 2019 16:59:07 +0000 (09:59 -0700)]
Merge "simpleperf: support profiling art interpreter on linux host."
am:
749f0bac4a
Change-Id: Iac4e835efe67677c36aa1a29ab4eebc8a41d7633
Xin Li [Thu, 5 Sep 2019 16:53:33 +0000 (16:53 +0000)]
Merge "DO NOT MERGE - Merge Android 10 into master"
Treehugger Robot [Thu, 5 Sep 2019 16:45:38 +0000 (16:45 +0000)]
Merge "simpleperf: support profiling art interpreter on linux host."
Yabin Cui [Wed, 4 Sep 2019 22:49:19 +0000 (15:49 -0700)]
simpleperf: support profiling art interpreter on linux host.
Bug:
140300587
Test: run simpleperf_unit_test.
Test: run simpleperf on host.
Change-Id: Ia2e21cabf2661c82bb611c525d5277b1e4d13a23
Xin Li [Wed, 4 Sep 2019 20:35:27 +0000 (13:35 -0700)]
DO NOT MERGE - Merge Android 10 into master
Bug:
139893257
Change-Id: I35ce2edc54690d76c26efed846e232ff223ebb4e
Peter Enderborg [Tue, 3 Sep 2019 21:32:57 +0000 (14:32 -0700)]
Merge "Add support for new taskstats v9 functionality" am:
9229017530 am:
8db948eff7
am:
572f86ea5f
Change-Id: I322456d75452f7fd2e3d56797717919dfb8cf258
Peter Enderborg [Tue, 3 Sep 2019 21:17:09 +0000 (14:17 -0700)]
Merge "Add support for new taskstats v9 functionality" am:
9229017530
am:
8db948eff7
Change-Id: I333ee7acf008b56c65a9057d4e944c60b53e3082
Peter Enderborg [Tue, 3 Sep 2019 20:56:38 +0000 (13:56 -0700)]
Merge "Add support for new taskstats v9 functionality"
am:
9229017530
Change-Id: Ifc4601aa55c3475e726470189c3b56613fdc47c8
Treehugger Robot [Tue, 3 Sep 2019 20:37:06 +0000 (20:37 +0000)]
Merge "Add support for new taskstats v9 functionality"
Yabin Cui [Tue, 3 Sep 2019 17:54:38 +0000 (10:54 -0700)]
Merge "simpleperf: switch to llvm-symbolizer." am:
f626973b9a am:
617bd5592a
am:
ec46bff35f
Change-Id: I08a0adf3bd78ec4f36aed73a6fdd74d477fb7fdb
Yabin Cui [Tue, 3 Sep 2019 17:47:41 +0000 (10:47 -0700)]
Merge "simpleperf: switch to llvm-symbolizer." am:
f626973b9a
am:
617bd5592a
Change-Id: I51d26acae29b7c80458dd9888b6af21176f09aa5
Yabin Cui [Tue, 3 Sep 2019 17:41:15 +0000 (10:41 -0700)]
Merge "simpleperf: switch to llvm-symbolizer."
am:
f626973b9a
Change-Id: Iba347945d89f95967815e58809b90d667e0df8d5
Yabin Cui [Tue, 3 Sep 2019 17:21:54 +0000 (17:21 +0000)]
Merge "simpleperf: switch to llvm-symbolizer."
Yabin Cui [Fri, 30 Aug 2019 22:51:33 +0000 (15:51 -0700)]
simpleperf: switch to llvm-symbolizer.
Bug:
74395415
Test: run test.py.
Change-Id: I4cc0013735bedcfd18813428e4892049277c38ff
Christopher Ferris [Fri, 30 Aug 2019 18:48:01 +0000 (11:48 -0700)]
Merge "Refactor code with single trace parser." am:
7ac993ce67 am:
2077beb1a9
am:
8a80143732
Change-Id: I6e0075870521d601d489571c07027071140a8a71
Christopher Ferris [Fri, 30 Aug 2019 18:29:55 +0000 (11:29 -0700)]
Merge "Refactor code with single trace parser." am:
7ac993ce67
am:
2077beb1a9
Change-Id: I91c9c89815948ed4e61460ef9bd0cbf1c3e80db0
Christopher Ferris [Fri, 30 Aug 2019 18:17:55 +0000 (11:17 -0700)]
Merge "Refactor code with single trace parser."
am:
7ac993ce67
Change-Id: Iff4618349bce7e22456bf004b861daafcc0328f6
Christopher Ferris [Fri, 30 Aug 2019 17:47:00 +0000 (17:47 +0000)]
Merge "Refactor code with single trace parser."
Christopher Ferris [Tue, 27 Aug 2019 00:51:19 +0000 (17:51 -0700)]
Refactor code with single trace parser.
This is the first step towards adding a new way to benchmark the
traces. This new way would be a way to add all threads running at once.
Also to try and make it possible to do the faster runs that jmgao had
done a while ago.
Modified the code so that it's possible for memory_replay to play
the zip file, no need to unzip the trace files.
Add a single parser for the trace files.
Remove as many possible allocation points in the system. This allows
the traces to be run as pure as possible.
Added new unit tests to cover new code.
Bug:
137795072
Test: All unit tests pass.
Test: Ran select traces using the old version and the new version.
Test: Both get nearlyt he same RSS, but slightly different VA space
Test: due to the new version avoiding allocations at all costs.
Test: Ran the trace benchmarks and verified that the old version and the
Test: new version produce nearly the same numbers.
Change-Id: I8e8a28436f23b09eba57772c62bb0b866d874437
Yabin Cui [Fri, 30 Aug 2019 00:13:00 +0000 (17:13 -0700)]
Merge "simpleperf: add --include-filter in record cmd." am:
178d1d48bf am:
64146b2a17
am:
0fe1554768
Change-Id: I022874f6155d2ee09faae6307b17b00871c6a059
Yabin Cui [Thu, 29 Aug 2019 23:53:45 +0000 (16:53 -0700)]
Merge "simpleperf: add --include-filter in record cmd." am:
178d1d48bf
am:
64146b2a17
Change-Id: Id9b986dc05b4abb303630b51e6eefb8fc08c3b5c
Yabin Cui [Thu, 29 Aug 2019 23:47:02 +0000 (16:47 -0700)]
Merge "simpleperf: add --include-filter in record cmd."
am:
178d1d48bf
Change-Id: Ib04498c4d08229a815bb24d65048fde1f6d97b42
Yabin Cui [Thu, 29 Aug 2019 23:37:14 +0000 (23:37 +0000)]
Merge "simpleperf: add --include-filter in record cmd."
Yabin Cui [Tue, 6 Aug 2019 17:29:45 +0000 (10:29 -0700)]
simpleperf: add --include-filter in record cmd.
It is to only record selected binaries in cs-etm tracing.
Bug:
135204414
Test: run simpleperf_unit_test.
Change-Id: I5dae729aee1642d9384ee9bb88ee8cb25950131a
David Anderson [Wed, 28 Aug 2019 03:15:47 +0000 (20:15 -0700)]
Merge "Update lpdump to recognize LP_PARTITION_ATTR_UPDATED." am:
3562ed57ed am:
aed02f2a70
am:
4e424d9f8c
Change-Id: I5cb04c3488dfba89c6c993eb1da3b6a969d25b37
David Anderson [Wed, 28 Aug 2019 03:07:45 +0000 (20:07 -0700)]
Merge "Update lpdump to recognize LP_PARTITION_ATTR_UPDATED." am:
3562ed57ed
am:
aed02f2a70
Change-Id: Iffb8cd80bc459d1cc94ef9291a5b7aaa5dcf28dd
David Anderson [Wed, 28 Aug 2019 03:00:49 +0000 (20:00 -0700)]
Merge "Update lpdump to recognize LP_PARTITION_ATTR_UPDATED."
am:
3562ed57ed
Change-Id: I193a78d01e2066a2f07b8d83906cd0a839957a8c
David Anderson [Wed, 28 Aug 2019 02:51:43 +0000 (02:51 +0000)]
Merge "Update lpdump to recognize LP_PARTITION_ATTR_UPDATED."
David Anderson [Tue, 27 Aug 2019 20:44:48 +0000 (13:44 -0700)]
Update lpdump to recognize LP_PARTITION_ATTR_UPDATED.
Bug:
139154795
Test: lpdump after update
Change-Id: I4cbfe80c15cfa0afe3e9d37e3f8818016e57daa2
Paul Crowley [Tue, 27 Aug 2019 03:03:25 +0000 (20:03 -0700)]
Merge "Move fscrypt_init_extensions into system/core" am:
39e92468ad am:
55f0b4def8
am:
80bee30dad
Change-Id: I2b5f432619026cc6faacb5aec9fa5a408579379e
Paul Crowley [Tue, 27 Aug 2019 02:33:18 +0000 (19:33 -0700)]
Merge "If the rollback directories won't encrypt, wipe them" am:
43ce86f084 am:
781bdf281c
am:
61576e5cf3
Change-Id: I7b2222d72cd42a22017ece9b69239553225dde0c
Paul Crowley [Tue, 27 Aug 2019 02:10:14 +0000 (19:10 -0700)]
Merge "Move fscrypt_init_extensions into system/core" am:
39e92468ad
am:
55f0b4def8
Change-Id: I16d9b00a05e2af01647dd5b19411b6d7362aa161
Paul Crowley [Tue, 27 Aug 2019 01:53:04 +0000 (18:53 -0700)]
Merge "If the rollback directories won't encrypt, wipe them" am:
43ce86f084
am:
781bdf281c
Change-Id: I6356abd1d9b7b615c1ebefb3efdc3c69bd3e378f
Paul Crowley [Tue, 27 Aug 2019 01:03:14 +0000 (18:03 -0700)]
Merge "Move fscrypt_init_extensions into system/core"
am:
39e92468ad
Change-Id: I14922f2abc8ca1644fdedcdb51a3d5409df54f58
Paul Crowley [Tue, 27 Aug 2019 00:50:56 +0000 (17:50 -0700)]
Merge "If the rollback directories won't encrypt, wipe them"
am:
43ce86f084
Change-Id: Ib592f2e3fc0215dea881df16adf85569354edc30
Treehugger Robot [Mon, 26 Aug 2019 23:24:54 +0000 (23:24 +0000)]
Merge "Move fscrypt_init_extensions into system/core"
Treehugger Robot [Mon, 26 Aug 2019 23:24:49 +0000 (23:24 +0000)]
Merge "If the rollback directories won't encrypt, wipe them"
Paul Crowley [Mon, 26 Aug 2019 17:30:54 +0000 (10:30 -0700)]
Move fscrypt_init_extensions into system/core
Bug:
140027478
Test: treehugger
Change-Id: I296ce6d1272816c237e1ad213fbdef9f6fafb44f
Paul Crowley [Fri, 9 Aug 2019 21:19:11 +0000 (14:19 -0700)]
If the rollback directories won't encrypt, wipe them
/data/rollback and /data/rollback-observer used to be created
unencrypted by system-server. If they are unencrypted and have
content, force them to be encrypted by wiping their contents.
Bug: b/
139193659
Test: Put content in these directories, then reboot and see it wiped.
Cherrypicked-from:
58a49c3ae59d250cc1db49ce5a2678bf19bb92c3
Change-Id: I0320eb645ebe86965928acbacc8ad01dae2d5ba5
Merged-In: I0320eb645ebe86965928acbacc8ad01dae2d5ba5
Yabin Cui [Thu, 22 Aug 2019 21:43:57 +0000 (14:43 -0700)]
Merge "simpleperf: fix is_elf_file." am:
abde21870e am:
b321cc63f8
am:
ffc5995997
Change-Id: Iebb19de3f11e702014c4120ccfd24359f3b1f226
Yabin Cui [Thu, 22 Aug 2019 21:42:43 +0000 (14:42 -0700)]
Merge "simpleperf: add inject cmd." am:
93dac5f6ac am:
41968dd856
am:
738200600f
Change-Id: Ibc1bc64a31d5e3bb60f83e5f68f72f6cc5c07e44
Yabin Cui [Thu, 22 Aug 2019 21:35:11 +0000 (14:35 -0700)]
Merge "simpleperf: fix is_elf_file." am:
abde21870e
am:
b321cc63f8
Change-Id: I76f1cd64fa205377fb4806545e447f0e20b92c3b
Yabin Cui [Thu, 22 Aug 2019 21:33:45 +0000 (14:33 -0700)]
Merge "simpleperf: add inject cmd." am:
93dac5f6ac
am:
41968dd856
Change-Id: If6d2b0a9cf74642e1423a3a5e473c8c1e15cc0cd
Yabin Cui [Thu, 22 Aug 2019 21:23:47 +0000 (14:23 -0700)]
Merge "simpleperf: fix is_elf_file."
am:
abde21870e
Change-Id: Ie8001786fec5cb09e2ce76d9fe4b882b2ff18b0a
OSDN Git Service
