OSDN Git Service
Paul Crowley [Tue, 29 Oct 2019 02:22:36 +0000 (19:22 -0700)]
Merge changes from topic "fstab-options"
am:
2982299b90
Change-Id: I580505f44e61ff7f952c1cd7c548a3a995333f72
Paul Crowley [Tue, 29 Oct 2019 02:22:25 +0000 (19:22 -0700)]
libfscrypt: Log which version of policy we set.
am:
9444d62255
Change-Id: I00abfa9dd60e7be3d8c4e54b27449895dedec914
Paul Crowley [Tue, 29 Oct 2019 02:00:36 +0000 (02:00 +0000)]
Merge changes from topic "fstab-options"
* changes:
libfscrypt: Options parser now fills missing defaults
libfscrypt: Log which version of policy we set.
Paul Crowley [Fri, 25 Oct 2019 06:27:50 +0000 (23:27 -0700)]
libfscrypt: Options parser now fills missing defaults
Bug:
143307095
Test: use parser for fstab
Change-Id: Ia103a2e7947d03fb50a378472203363477d865e5
Paul Crowley [Fri, 25 Oct 2019 05:51:20 +0000 (22:51 -0700)]
libfscrypt: Log which version of policy we set.
Bug:
143307095
Test: check logs
Change-Id: Ib8a91dc153919063bc3daf5075848a64a7e48cf8
Yabin Cui [Fri, 25 Oct 2019 21:51:11 +0000 (14:51 -0700)]
Merge "simpleperf: don't adjust frequency for etm recording."
am:
72e2ec035d
Change-Id: I6251064049197e437d3d1ebc69f2c8db7807880f
Yabin Cui [Fri, 25 Oct 2019 21:32:36 +0000 (21:32 +0000)]
Merge "simpleperf: don't adjust frequency for etm recording."
Paul Crowley [Fri, 25 Oct 2019 18:14:48 +0000 (11:14 -0700)]
Merge "Provide struct-based C++ interface"
am:
ccdb80d368
Change-Id: Ide55716ffc353d354fbff14ef4475982e503b723
Paul Crowley [Fri, 25 Oct 2019 18:05:26 +0000 (18:05 +0000)]
Merge "Provide struct-based C++ interface"
Paul Crowley [Thu, 24 Oct 2019 21:51:44 +0000 (14:51 -0700)]
Provide struct-based C++ interface
Replace many-parameter C interface with a cleaner and more complete
C++ interface for passing around policies in a struct.
Bug:
143307095
Test: treehugger
Change-Id: I95aeaae211f7ad698854bcc66c6d25a0bcb24cfe
Wei Wang [Fri, 25 Oct 2019 02:31:54 +0000 (19:31 -0700)]
Merge "libperfmgr: remove node written tests"
am:
ace4514d71
Change-Id: I68f0c05f5c5b04bafb07dc98f8ce7eb0699896b7
Wei Wang [Fri, 25 Oct 2019 02:18:28 +0000 (02:18 +0000)]
Merge "libperfmgr: remove node written tests"
Wei Wang [Thu, 24 Oct 2019 23:42:35 +0000 (16:42 -0700)]
libperfmgr: remove node written tests
Test: build
Change-Id: I0754c42a46f0a7f252190dcad2a58bc7877a85cf
Wei Wang [Thu, 24 Oct 2019 04:25:45 +0000 (21:25 -0700)]
Merge "Update help commands"
am:
f133fac48c
Change-Id: I81aaa1c3f122529c9f1d728e20e50e0ed531976d
Wei Wang [Thu, 24 Oct 2019 04:10:49 +0000 (04:10 +0000)]
Merge "Update help commands"
TreeHugger Robot [Thu, 24 Oct 2019 00:26:48 +0000 (00:26 +0000)]
Merge "Skip QD1A.190821.011 in stage-aosp-master" into stage-aosp-master
Wei Wang [Wed, 23 Oct 2019 23:08:03 +0000 (16:08 -0700)]
Update help commands
Test: build
Change-Id: I41b2e23d19c8e01927ae7e78585f19aedfd2a37a
Wei Wang [Wed, 23 Oct 2019 22:35:55 +0000 (15:35 -0700)]
Merge "add options to exec individual hint and specify hint duration"
am:
c3e7371880
Change-Id: I9e4a262520f95b7a87ce1de3dd53d36a499e15e4
Wei Wang [Wed, 23 Oct 2019 22:06:35 +0000 (22:06 +0000)]
Merge "add options to exec individual hint and specify hint duration"
Wei Wang [Wed, 23 Oct 2019 00:06:50 +0000 (17:06 -0700)]
add options to exec individual hint and specify hint duration
Test: boot and run perfmgr_config_verifier
Change-Id: I0239edc457a04f793bd85a81e726668d605321f7
Yabin Cui [Mon, 21 Oct 2019 22:12:40 +0000 (15:12 -0700)]
Merge "simpleperf: add periodic callback to flush etm data."
am:
b0afbc964f
Change-Id: I206910e8132e4681929d5b67a2dbc4a50227d2e2
Yabin Cui [Mon, 21 Oct 2019 18:26:06 +0000 (11:26 -0700)]
simpleperf: don't adjust frequency for etm recording.
Bug: none
Test: run simpleperf_unit_test.
Change-Id: I401bcc72492b8a751c4a06f37026ef93d0af74c0
Yabin Cui [Mon, 21 Oct 2019 21:18:14 +0000 (21:18 +0000)]
Merge "simpleperf: add periodic callback to flush etm data."
Yabin Cui [Mon, 21 Oct 2019 20:28:12 +0000 (13:28 -0700)]
Merge "simpleperf: fix ScopedEventTypes."
am:
d5c0d63fc1
Change-Id: I66373e86dff93084256068b825b78f9e261b8132
Yabin Cui [Mon, 21 Oct 2019 18:54:46 +0000 (18:54 +0000)]
Merge "simpleperf: fix ScopedEventTypes."
Yabin Cui [Fri, 18 Oct 2019 23:54:47 +0000 (16:54 -0700)]
simpleperf: add periodic callback to flush etm data.
Bug: none
Test: run simpleperf_unit_test.
Test: record etm data manually.
Change-Id: I620bcd0606c5ecf7eb076db503baad7f1a54b1d4
Martin Stjernholm [Sat, 19 Oct 2019 12:38:42 +0000 (05:38 -0700)]
Merge "Clean up unnecessary dependency on ART internal defaults module."
am:
1476635e45
Change-Id: Id84a9a4d0708b7cec8738b0b73d4fddbf44ae349
Treehugger Robot [Sat, 19 Oct 2019 12:20:47 +0000 (12:20 +0000)]
Merge "Clean up unnecessary dependency on ART internal defaults module."
Yabin Cui [Sat, 19 Oct 2019 00:23:32 +0000 (17:23 -0700)]
simpleperf: fix ScopedEventTypes.
Bug: none
Test: run simpleperf_unit_test.
Change-Id: I7d9e91075e535ff5c85d4c13a301704359907f0a
Yabin Cui [Fri, 18 Oct 2019 23:56:10 +0000 (16:56 -0700)]
Merge "simpleperf: reduce and recover from etm decoding errors."
am:
81932dc525
Change-Id: Ife0846a3ea8df69c33f0feef4ab60f17cce08fe7
Yabin Cui [Fri, 18 Oct 2019 23:24:43 +0000 (23:24 +0000)]
Merge "simpleperf: reduce and recover from etm decoding errors."
Yabin Cui [Fri, 18 Oct 2019 21:01:15 +0000 (14:01 -0700)]
simpleperf: reduce and recover from etm decoding errors.
ETM decoding fails when processing some invalid data like invalid packet
headers. Invalid data may be caused by truncated etm data or other
reasons.
Invalid data can be skipped by resetting decoders, which will force
decoders to look for sync points (I_ASYNC packets) in the data stream.
So to fix the problem:
1. Reset decoders when processing a new data block, which avoid invalid
data at the beginning of a block.
2. When having a decoding error, recover from it by resetting decoders.
Bug: none
Test: run simpleperf_unit_test.
Test: record and decode etm data continuously on device.
Change-Id: If44edc04428f22e605afe994aabeb6ff350cffb1
Christopher Ferris [Fri, 18 Oct 2019 01:05:41 +0000 (18:05 -0700)]
Merge "Allow trace files to be zipped or text files."
am:
9a28fa0125
Change-Id: I629d73519af7db2ee5a404f26546a079c988e5ce
Christopher Ferris [Fri, 18 Oct 2019 00:54:49 +0000 (00:54 +0000)]
Merge "Allow trace files to be zipped or text files."
Martin Stjernholm [Wed, 9 Oct 2019 23:26:01 +0000 (00:26 +0100)]
Clean up unnecessary dependency on ART internal defaults module.
Only libdexfile_support_static is actually used.
Test: atest system/extras/simpleperf
Bug:
133140750
Change-Id: I2d71b25a1610664648f9172613046ae1ab13177f
Christopher Ferris [Thu, 17 Oct 2019 21:58:57 +0000 (14:58 -0700)]
Allow trace files to be zipped or text files.
Add and update unit tests to verify this behavior.
Test: Ran unit tests.
Test: Ran memory_replay on zipped file and text file.
Test: Ran trace_benchmark.
Change-Id: I296b27902a5a53a130a2c09063efc369830a9d05
Xin Li [Wed, 16 Oct 2019 22:19:31 +0000 (15:19 -0700)]
Skip QD1A.190821.011 in stage-aosp-master
Bug:
141248619
Change-Id: If13d25087fb538b7165d10fd1a010953ba86c58d
Yabin Cui [Fri, 11 Oct 2019 21:26:39 +0000 (14:26 -0700)]
Merge "simpleperf: update simpleperf prebuilts to build
5933778."
am:
a8bd5066f2
Change-Id: Ie72385ef75198b8420218921990b7a2c83f24d97
Treehugger Robot [Fri, 11 Oct 2019 21:08:09 +0000 (21:08 +0000)]
Merge "simpleperf: update simpleperf prebuilts to build
5933778."
Yabin Cui [Fri, 11 Oct 2019 17:19:32 +0000 (10:19 -0700)]
simpleperf: update simpleperf prebuilts to build
5933778.
Taken from branch aosp-simpleperf-release.
Bug: none
Test: run test.py on linux.
Change-Id: I79ccb883d484812866e6f11d494ee8c5c6042856
Yabin Cui [Fri, 11 Oct 2019 00:45:06 +0000 (17:45 -0700)]
Merge "simpleperf: change based on jit debug interface change."
am:
84b9c942fb
Change-Id: I9ee97e7510c288ffafe0e7cbd968b163046435d4
Yabin Cui [Fri, 11 Oct 2019 00:22:16 +0000 (00:22 +0000)]
Merge "simpleperf: change based on jit debug interface change."
Yabin Cui [Mon, 7 Oct 2019 22:15:12 +0000 (15:15 -0700)]
simpleperf: change based on jit debug interface change.
1. Change magic field and sizeof_entry check for JITDescriptor.
2. Use seqlock field in JITCodeEntryV2 to check its valid.
3. Allow but skip entry with symfile_size = 0 in V2.
Bug:
141558390
Test: run simpleperf_unit_test.
Change-Id: I30e214597cec78c73492fdfeac1f9766b775f0e3
Yabin Cui [Wed, 9 Oct 2019 17:48:52 +0000 (10:48 -0700)]
Merge "simpleperf: create one map for each jit symbol."
am:
7ea25d629c
Change-Id: I860b84d19fada18f48f35b0fb36f278d2e3e4f6a
Yabin Cui [Wed, 9 Oct 2019 17:14:43 +0000 (17:14 +0000)]
Merge "simpleperf: create one map for each jit symbol."
Yabin Cui [Tue, 8 Oct 2019 23:27:09 +0000 (16:27 -0700)]
Merge "simpleperf: merge jitted and interpreted java methods."
am:
bf9f91a149
Change-Id: Iad4f3daffa1cf3cf315a0e6de4575fdf04b19b5c
Yabin Cui [Tue, 8 Oct 2019 23:10:18 +0000 (23:10 +0000)]
Merge "simpleperf: merge jitted and interpreted java methods."
Yabin Cui [Tue, 8 Oct 2019 00:44:05 +0000 (17:44 -0700)]
simpleperf: merge jitted and interpreted java methods.
Bug:
132370901
Test: run test.py TestReportLib.test_merge_java_methods.
Change-Id: I9e2cc9a0db6a6f94611947c4f146a51aff85d593
Yabin Cui [Mon, 7 Oct 2019 22:57:56 +0000 (15:57 -0700)]
simpleperf: create one map for each jit symbol.
JIT debug interface in ART regularly repacks jit symbols, making
overlapped jit symfile maps:
For example, jit symfile A contains many symbols, in addr range [0xa000, 0xb000),
but excluding [0xa100, 0xa110]. And jit symfile B contains only one symbol, in
addr range [0xa100, 0xa108).
So jit symfile A and B have overlapped addr range, while the symbols in
them are all valid.
Simpleperf can't keep maps with overlapped addr range, thus fails to unwind in
this situation.
Fix it by creating one map for each jit symbol instead of jit symfile.
Bug: none
Test: run simpleperf_unit_test.
Test: run test.py TestRecordingRealApps.test_recording_displaybitmaps.
Change-Id: I8392bb331c98830dc9a98031a08c0567dd66ff4b
Eric Biggers [Mon, 7 Oct 2019 19:26:49 +0000 (12:26 -0700)]
Merge "libfscrypt: support setting v2 encryption policies"
am:
c5f7c38480
Change-Id: Ief71f4a70e9e2c2be5524a44795c793cf5bd311b
Eric Biggers [Mon, 7 Oct 2019 19:09:44 +0000 (19:09 +0000)]
Merge "libfscrypt: support setting v2 encryption policies"
Anton Hansson [Fri, 4 Oct 2019 06:52:42 +0000 (23:52 -0700)]
Merge "Make cppreopts.sh deal with new layout"
am:
cf29d5254c
Change-Id: Ie9db469d29e292d3b44daaea2b274b0b37603920
Anton Hansson [Fri, 4 Oct 2019 06:30:55 +0000 (06:30 +0000)]
Merge "Make cppreopts.sh deal with new layout"
Yabin Cui [Thu, 3 Oct 2019 20:47:10 +0000 (13:47 -0700)]
Merge "simpleperf: add app tests in python test."
am:
955434d2fc
Change-Id: I308992609af219fd6774dce78af75e55efa9f180
Yabin Cui [Thu, 3 Oct 2019 20:31:04 +0000 (20:31 +0000)]
Merge "simpleperf: add app tests in python test."
Yabin Cui [Thu, 3 Oct 2019 19:06:27 +0000 (12:06 -0700)]
simpleperf: add app tests in python test.
Also fix log overwrite in TestLogger.
Bug:
141882072
Test: run test.py TestRecordingRealApps*.
Change-Id: I0e85224c40a66dbbd1caab5ff0bb48852712a06e
Anton Hansson [Thu, 3 Oct 2019 13:16:38 +0000 (14:16 +0100)]
Make cppreopts.sh deal with new layout
.odex and .vdex files on system_other are being moved to a subdir
with the name of their source partition. Update cppreopts to
recognize this and pass the right source path to preopt2cachename.
Bug:
141707536
Test: manually verify name of dalvik-cache files post boot
Test: dumpsys package [system-package]; verify reason=prebuilt
Change-Id: Icb5b5307ad42b7c899e11212843ce4b96b015958
Yabin Cui [Tue, 1 Oct 2019 21:23:13 +0000 (14:23 -0700)]
Merge "simpleperf: add tests recording real apps."
am:
0edad652cf
Change-Id: If81e6c1fde20f8160741a997cac01bcdc32b9dc2
Yabin Cui [Tue, 1 Oct 2019 21:15:16 +0000 (21:15 +0000)]
Merge "simpleperf: add tests recording real apps."
Yabin Cui [Mon, 30 Sep 2019 23:46:26 +0000 (16:46 -0700)]
simpleperf: add tests recording real apps.
This is to test failures more likely to be reproduced when recording real apps.
Bug:
141882072
Test: run simpleperf_unit_test on both arm64 and x86.
Change-Id: I20da128b6721c32c0205341a16f63414510753c9
Eric Biggers [Fri, 13 Sep 2019 18:07:42 +0000 (11:07 -0700)]
libfscrypt: support setting v2 encryption policies
Update libfscrypt to support setting v2 encryption policies. For this,
the ioctl to use is still FS_IOC_SET_ENCRYPTION_POLICY; we just need to
pass it a slightly different structure.
v2 policies support the same encryption modes and flags as v1 policies,
but internally they use a more standard, secure, and flexible KDF. Due
to this, some future features will be supported by v2 policies only.
Other notes:
- Use 16 byte filenames padding for all v2 policies. There's no need to
use the legacy 4 bytes padding.
- Unlike v1 policies, setting a v2 policy requires CAP_FOWNER if the key
hasn't been installed. This isn't an issue for Android, however --
Android always installs the keys first, and even if it didn't,
policies are only set by init and vold, which have CAP_FOWNER.
Bug:
140500999
Test: tested as series; see If64028d8580584b2c33c614cabd5d6b93657f608
Change-Id: I325f75fd3e59d6f00a5c66938b99b127981183a5
Tom Cherry [Fri, 27 Sep 2019 16:24:35 +0000 (09:24 -0700)]
Merge changes from topic "logwrapper-api-update"
am:
0888874bb4
Change-Id: I118a28b210927073703edb04dabf6c5bba935e27
Tom Cherry [Fri, 27 Sep 2019 15:31:04 +0000 (15:31 +0000)]
Merge changes from topic "logwrapper-api-update"
* changes:
Update system/extras for logwrapper
puncture_fs: convert to C++ and update for logwrapper
Tom Cherry [Wed, 25 Sep 2019 23:48:07 +0000 (16:48 -0700)]
Update system/extras for logwrapper
Test: build
Change-Id: I60bd71671ef18b62f3d4152e3061133eafa935f8
Tom Cherry [Wed, 25 Sep 2019 22:31:47 +0000 (15:31 -0700)]
puncture_fs: convert to C++ and update for logwrapper
This was logwrapper's last C dependency to convert it to C++ for the
incoming updates.
Test: builds
Change-Id: I71feb31032b6b4c8c7147d2111f9a685c0351e4b
Yifan Hong [Tue, 24 Sep 2019 20:13:05 +0000 (13:13 -0700)]
Merge "lpdump: print partitions in super in order"
am:
16e39c46b8
Change-Id: I8fe5244a52cfdd1246c30c0f71e1f074562ac678
Treehugger Robot [Tue, 24 Sep 2019 19:57:20 +0000 (19:57 +0000)]
Merge "lpdump: print partitions in super in order"
Yifan Hong [Tue, 24 Sep 2019 01:01:20 +0000 (18:01 -0700)]
lpdump: print partitions in super in order
Easier to understand where are all the extents.
Test: run it
Change-Id: I88511fe4ed0d23882872c7434422f0a42cd3ee1f
Yabin Cui [Mon, 23 Sep 2019 21:08:57 +0000 (14:08 -0700)]
Merge "simpleperf: fix location addresses in generated pprof files."
am:
1720053bc5
Change-Id: If7485b6ccc4bf0ee62bad60399173ff235697f18
Yabin Cui [Mon, 23 Sep 2019 20:44:23 +0000 (20:44 +0000)]
Merge "simpleperf: fix location addresses in generated pprof files."
Yabin Cui [Mon, 23 Sep 2019 19:35:03 +0000 (12:35 -0700)]
simpleperf: fix location addresses in generated pprof files.
The address of a location in pprof proto files should be within memory
range of the corresponding mapping. But in pprof_proto_generator.py,
it is written as the virtual address in elf file.
Bug:
141026312
Test: run test.py TestPprofProtoGenerator*
Change-Id: I3bc13548477b6b6069f712035b7177cc4bd60c80
Daniel Mentz [Fri, 20 Sep 2019 17:37:01 +0000 (10:37 -0700)]
Merge "mkuserimg_mke2fs.py: Package mke2fs.conf"
am:
61c47892cc
Change-Id: I94d95f31f20aee43aed60d3ce24646d44598b74d
Daniel Mentz [Fri, 20 Sep 2019 17:12:12 +0000 (17:12 +0000)]
Merge "mkuserimg_mke2fs.py: Package mke2fs.conf"
Yabin Cui [Thu, 19 Sep 2019 23:29:22 +0000 (16:29 -0700)]
Merge "simpleperf: output text format for autofdo in inject cmd."
am:
9ad7a2597f
Change-Id: Id4f07251dead2f2eb6e9d2ac6b5001a7952fcb73
Yabin Cui [Thu, 19 Sep 2019 23:28:54 +0000 (16:28 -0700)]
Merge "simpleperf: split test progress and log of test.py."
am:
15f2323247
Change-Id: I8dab2e230054c793f4acdc8f8638314b2320d699
Yabin Cui [Thu, 19 Sep 2019 23:15:42 +0000 (23:15 +0000)]
Merge "simpleperf: output text format for autofdo in inject cmd."
Yabin Cui [Thu, 19 Sep 2019 23:15:13 +0000 (23:15 +0000)]
Merge "simpleperf: split test progress and log of test.py."
Yabin Cui [Mon, 16 Sep 2019 23:34:29 +0000 (16:34 -0700)]
simpleperf: split test progress and log of test.py.
Currently test.py outputs both test progress and log in stderr,
making output hard to parse. So only keep test progress in
stderr, and move verbose log to test_python_{2,3}.log.
Since we keep test logs, continue testing even when some tests fail.
Also move deprecated assertEquals to assertEqual.
Bug:
140958894
Test: run test.py.
Change-Id: I11c168cbc934055b47a3df44fc6d568824282702
Yabin Cui [Wed, 18 Sep 2019 23:05:51 +0000 (16:05 -0700)]
simpleperf: output text format for autofdo in inject cmd.
Also add --binary option to selected binaries for generating data.
Because AutoFDO only accepts one binary input.
Test it manually with a simple example as below:
1. on device, run `./simpleperf record -e cs-etm:u ./etm_test_multi_thread`.
2. on device, run `./simpleperf inject --binary test_loop_b`.
3. on host, run `adb pull /data/local/tmp/perf_inject.data`.
4. on host, run `./create_llvm_prof -binary=libetm_test_loop_b.so
-profile=perf_inject.data -profiler=text -out=a`.
And create_llvm_prof can generate output successfully.
Bug:
141013987
Test: run simpleperf_unit_test.
Change-Id: Iacc0e3ed4cc47c91d5764e7b0394718436211514
Christopher Ferris [Thu, 19 Sep 2019 15:08:16 +0000 (08:08 -0700)]
Merge "Add support for scudo native allocator."
am:
c63affea9a
Change-Id: I934cbfa3f5c940aed1cdbd49acab45e629335108
Christopher Ferris [Thu, 19 Sep 2019 14:42:26 +0000 (14:42 +0000)]
Merge "Add support for scudo native allocator."
Kaiwen Szu [Thu, 19 Sep 2019 10:43:44 +0000 (03:43 -0700)]
Merge "Add vbmake to build super_vbmeta.img"
am:
1c23735731
Change-Id: I44de5a5c1c67e3d23a10a9b18d1e03c52fcabd93
Treehugger Robot [Thu, 19 Sep 2019 10:21:53 +0000 (10:21 +0000)]
Merge "Add vbmake to build super_vbmeta.img"
Daniel Mentz [Tue, 10 Sep 2019 23:31:53 +0000 (16:31 -0700)]
mkuserimg_mke2fs.py: Package mke2fs.conf
Depending on the environment where mkuserimg_mke2fs.py is used, it's
difficult to locate the configuration file mke2fs.conf. To avoid
potential issues, let's just package mke2fs.conf with
mkuserimg_mke2fs.py.
Bug:
112937752
Change-Id: I9eb911fc9357e65a666bafd3089461cac8289008
Christopher Ferris [Wed, 18 Sep 2019 17:31:40 +0000 (10:31 -0700)]
Add support for scudo native allocator.
Bug:
137795072
Test: Unit tests pass.
Test: Ran memory_replay and verified that RSS is non-zero.
Change-Id: I266b9d4e4d1c1a3011acc47f9891a2b65979d870
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: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: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: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: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 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