OSDN Git Service
Paul Crowley [Fri, 25 Oct 2019 18:34:53 +0000 (11:34 -0700)]
Merge "Provide struct-based C++ interface" am:
ccdb80d368 am:
9235c26552
am:
e2547be4b7
Change-Id: I8269fc27f3b532c209825ccae5de32510e527e4b
Paul Crowley [Fri, 25 Oct 2019 18:20:37 +0000 (11:20 -0700)]
Merge "Provide struct-based C++ interface" am:
ccdb80d368
am:
9235c26552
Change-Id: I04e93bc45f5c887b2eaf359f71866ffc0779eb57
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:44:00 +0000 (19:44 -0700)]
Merge "libperfmgr: remove node written tests" am:
ace4514d71 am:
408f15b038
am:
8fceeb3502
Change-Id: Ib32c110f3e7610d9c11be7c474b80cdbf9a856eb
Wei Wang [Fri, 25 Oct 2019 02:37:59 +0000 (19:37 -0700)]
Merge "libperfmgr: remove node written tests" am:
ace4514d71
am:
408f15b038
Change-Id: I7bf5d9e4d313d7cb16523d6bcc92070ec71ff41a
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:38:03 +0000 (21:38 -0700)]
Merge "Update help commands" am:
f133fac48c am:
c8bd2f01ce
am:
bb4121b34b
Change-Id: I0b5099eb8f25cf0dcbe800d9f315cf9bd64938e2
Wei Wang [Thu, 24 Oct 2019 04:32:02 +0000 (21:32 -0700)]
Merge "Update help commands" am:
f133fac48c
am:
c8bd2f01ce
Change-Id: Ifc6430023ff9a07a81d966503fc6c54db6bf6520
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"
Xin Li [Thu, 24 Oct 2019 00:58:59 +0000 (17:58 -0700)]
Merge "Skip QD1A.190821.011 in stage-aosp-master" into stage-aosp-master am:
1b1a005984
am:
0d75e22bd7
Change-Id: If1a1c56de063468a860e135f30a2b12e7d91dda7
Xin Li [Thu, 24 Oct 2019 00:39:02 +0000 (17:39 -0700)]
Merge "Skip QD1A.190821.011 in stage-aosp-master" into stage-aosp-master
am:
1b1a005984
Change-Id: I1a611be652e32582b32f34e1970af9fff3491682
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:12:26 +0000 (16:12 -0700)]
Merge "add options to exec individual hint and specify hint duration" am:
c3e7371880 am:
a920788dda
am:
f63d873995
Change-Id: I01adb436d99fd22faf5ffcf797c2e24f46869b84
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:53:39 +0000 (15:53 -0700)]
Merge "add options to exec individual hint and specify hint duration" am:
c3e7371880
am:
a920788dda
Change-Id: Ia04aefded85ba2cdcd07eb82037a82c7946cb266
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:26:30 +0000 (15:26 -0700)]
Merge "simpleperf: add periodic callback to flush etm data." am:
b0afbc964f am:
a822bb6b71
am:
fdc16846f7
Change-Id: I7ec7d8e1ce65d594b1ee14a467ab2d4c0555ed81
Yabin Cui [Mon, 21 Oct 2019 22:20:59 +0000 (15:20 -0700)]
Merge "simpleperf: add periodic callback to flush etm data." am:
b0afbc964f
am:
a822bb6b71
Change-Id: I6ea3b8618afc1d18f60bcc535f8207f65db273fa
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 21:18:14 +0000 (21:18 +0000)]
Merge "simpleperf: add periodic callback to flush etm data."
Yabin Cui [Mon, 21 Oct 2019 20:56:29 +0000 (13:56 -0700)]
Merge "simpleperf: fix ScopedEventTypes." am:
d5c0d63fc1 am:
b506415717
am:
30fa74af43
Change-Id: Id49808831f3e2eda3fd1a0f2ed2b8794675bec0f
Yabin Cui [Mon, 21 Oct 2019 20:41:17 +0000 (13:41 -0700)]
Merge "simpleperf: fix ScopedEventTypes." am:
d5c0d63fc1
am:
b506415717
Change-Id: I750d4e40808cf53fb4e79304cbd4bbd333e8c846
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:51:24 +0000 (05:51 -0700)]
Merge "Clean up unnecessary dependency on ART internal defaults module." am:
1476635e45 am:
e219f64bef
am:
7e596124cc
Change-Id: Ia5f24b60360336ccba12e23852d8ebea7296eff3
Martin Stjernholm [Sat, 19 Oct 2019 12:44:32 +0000 (05:44 -0700)]
Merge "Clean up unnecessary dependency on ART internal defaults module." am:
1476635e45
am:
e219f64bef
Change-Id: I6e9a48138e20f75fb399cc13f35d0759097fc6ab
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 [Sat, 19 Oct 2019 00:15:39 +0000 (17:15 -0700)]
Merge "simpleperf: reduce and recover from etm decoding errors." am:
81932dc525 am:
019f9b6c10
am:
b445166102
Change-Id: Ib7cb8adc7e39712d1c289eba619f8a50356ac11d
Yabin Cui [Sat, 19 Oct 2019 00:08:48 +0000 (17:08 -0700)]
Merge "simpleperf: reduce and recover from etm decoding errors." am:
81932dc525
am:
019f9b6c10
Change-Id: Icbf4aa95900f3f8ce8d4bcda8e22fda6c5d475a1
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:17:39 +0000 (18:17 -0700)]
Merge "Allow trace files to be zipped or text files." am:
9a28fa0125 am:
2c1300a975
am:
eae59617ab
Change-Id: I213d45c92651bc1f1b9baa44bde8986b6d6f13d1
Christopher Ferris [Fri, 18 Oct 2019 01:11:41 +0000 (18:11 -0700)]
Merge "Allow trace files to be zipped or text files." am:
9a28fa0125
am:
2c1300a975
Change-Id: I82a5d6e274c616c9cb52599fc07e7ab9a6a56403
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:39:09 +0000 (14:39 -0700)]
Merge "simpleperf: update simpleperf prebuilts to build
5933778." am:
a8bd5066f2 am:
352e30fdd5
am:
e34a3f46f4
Change-Id: I642b9e07e470d6569a3112926b6639bbba42e216
Yabin Cui [Fri, 11 Oct 2019 21:33:41 +0000 (14:33 -0700)]
Merge "simpleperf: update simpleperf prebuilts to build
5933778." am:
a8bd5066f2
am:
352e30fdd5
Change-Id: I4465b9a7a1dc6877b525ca1a4035612d8760c897
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:57:10 +0000 (17:57 -0700)]
Merge "simpleperf: change based on jit debug interface change." am:
84b9c942fb am:
1f8a3ed8e5
am:
840491d9da
Change-Id: I66abb0a985c06b2a886dece5fb91ce100781b512
Yabin Cui [Fri, 11 Oct 2019 00:51:08 +0000 (17:51 -0700)]
Merge "simpleperf: change based on jit debug interface change." am:
84b9c942fb
am:
1f8a3ed8e5
Change-Id: Id46154b4c129877a929c2d5425ffcc1dd73fd07e
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 18:00:47 +0000 (11:00 -0700)]
Merge "simpleperf: create one map for each jit symbol." am:
7ea25d629c am:
203ab50307
am:
4deff008fa
Change-Id: I74bb3dd52e8769ed512b35a885bae39cc7deda22
Yabin Cui [Wed, 9 Oct 2019 17:54:53 +0000 (10:54 -0700)]
Merge "simpleperf: create one map for each jit symbol." am:
7ea25d629c
am:
203ab50307
Change-Id: Idd43d2b0be007c0ceaf9c57866d5c4bf095ca964
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:41:08 +0000 (16:41 -0700)]
Merge "simpleperf: merge jitted and interpreted java methods." am:
bf9f91a149 am:
23bb1ed5aa
am:
96391810d3
Change-Id: Icaa97e9c6caa7e16b0660664cb1ebe2b37882087
Yabin Cui [Tue, 8 Oct 2019 23:34:33 +0000 (16:34 -0700)]
Merge "simpleperf: merge jitted and interpreted java methods." am:
bf9f91a149
am:
23bb1ed5aa
Change-Id: If24438d99a38c5e65a112b5815269471ab63295b
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:40:44 +0000 (12:40 -0700)]
Merge "libfscrypt: support setting v2 encryption policies" am:
c5f7c38480 am:
b202edbfa2
am:
bfd2c05079
Change-Id: I38804507a4bf13c8d9d1ed663d109767474bbf5c
Eric Biggers [Mon, 7 Oct 2019 19:33:45 +0000 (12:33 -0700)]
Merge "libfscrypt: support setting v2 encryption policies" am:
c5f7c38480
am:
b202edbfa2
Change-Id: I039ed787a38cf4844cdc81c66d44b149de064d0b
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 07:05:36 +0000 (00:05 -0700)]
Merge "Make cppreopts.sh deal with new layout" am:
cf29d5254c am:
5649b2b772
am:
6a6ebe3500
Change-Id: If5762de64b2891e3b41f45fe6d64a9fde03dbf2c
Anton Hansson [Fri, 4 Oct 2019 06:59:04 +0000 (23:59 -0700)]
Merge "Make cppreopts.sh deal with new layout" am:
cf29d5254c
am:
5649b2b772
Change-Id: I4785419f8abcb0ce1e15c2dd7aa7cf94a32c71d8
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 21:08:12 +0000 (14:08 -0700)]
Merge "simpleperf: add app tests in python test." am:
955434d2fc am:
047cfc1fdb
am:
5ca95aa718
Change-Id: Ib38e247ff45edc4310fa898d55a944975f39269c
Yabin Cui [Thu, 3 Oct 2019 20:55:51 +0000 (13:55 -0700)]
Merge "simpleperf: add app tests in python test." am:
955434d2fc
am:
047cfc1fdb
Change-Id: I994173c1d49a3dc350af1e2b87e8d85bc35ac3c1
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 [Wed, 2 Oct 2019 21:21:57 +0000 (14:21 -0700)]
Merge "simpleperf: add tests recording real apps." am:
0edad652cf am:
db0bd5e4d5
am:
636cc84a71
Change-Id: Id9bb276439a6f6168b612b4fa2497e8f3b9a942e
Yabin Cui [Wed, 2 Oct 2019 20:20:58 +0000 (13:20 -0700)]
Merge "simpleperf: add tests recording real apps." am:
0edad652cf
am:
db0bd5e4d5
Change-Id: Iaf619b6195267ae8caf75d3f11aa306116b5945f
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:53:21 +0000 (09:53 -0700)]
Merge changes from topic "logwrapper-api-update" am:
0888874bb4 am:
39cfd193bd
am:
fe9c676821
Change-Id: I4d07ae922ada4a8355372f9aa3ecf3b1f7dd1b79
Tom Cherry [Fri, 27 Sep 2019 16:39:04 +0000 (09:39 -0700)]
Merge changes from topic "logwrapper-api-update" am:
0888874bb4
am:
39cfd193bd
Change-Id: I272198c85fbe07c20d3fb60bca2a9709e615aeea
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:25:19 +0000 (13:25 -0700)]
Merge "lpdump: print partitions in super in order" am:
16e39c46b8 am:
5baa4d980c
am:
23d7980f5e
Change-Id: I73792fe9960c85d9ef273956c41774f7b6ef57d8
Yifan Hong [Tue, 24 Sep 2019 20:19:14 +0000 (13:19 -0700)]
Merge "lpdump: print partitions in super in order" am:
16e39c46b8
am:
5baa4d980c
Change-Id: Iaa5ebb3d094d77d36b8cff1b1ba2c8b7e5317719
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
OSDN Git Service
