OSDN Git Service
Yabin Cui [Fri, 19 Jun 2015 01:19:54 +0000 (01:19 +0000)]
am
60ed78f3: Merge "Simpleperf: support monitoring existing processes/threads."
* commit '
60ed78f3cb49e873d0a9aa40d5db33818d0259c2':
Simpleperf: support monitoring existing processes/threads.
Yabin Cui [Fri, 19 Jun 2015 00:56:22 +0000 (00:56 +0000)]
Merge "Simpleperf: support monitoring existing processes/threads."
Yabin Cui [Thu, 18 Jun 2015 04:15:09 +0000 (21:15 -0700)]
Simpleperf: support monitoring existing processes/threads.
Also change the default record freq from 1000 to 4000. Because 1000 seems to be too low.
Bug:
19483574
Change-Id: I340fcb9d28a156862705e483ee340a1c824eea21
Rom Lemarchand [Thu, 18 Jun 2015 22:44:32 +0000 (22:44 +0000)]
am
6a7ae1de: Merge "Swap column in procrank not reported with swap enabled"
* commit '
6a7ae1de941bace72151ebf288cdf61ea1cda1f5':
Swap column in procrank not reported with swap enabled
Rom Lemarchand [Thu, 18 Jun 2015 22:22:03 +0000 (22:22 +0000)]
Merge "Swap column in procrank not reported with swap enabled"
Yabin Cui [Thu, 18 Jun 2015 20:36:01 +0000 (20:36 +0000)]
am
1ded5c77: Merge "Simpleperf: add branch stack feature in perf.data."
* commit '
1ded5c77b86bf64d121251e70d84fbe7cf19b06c':
Simpleperf: add branch stack feature in perf.data.
Yabin Cui [Thu, 18 Jun 2015 20:17:54 +0000 (20:17 +0000)]
Merge "Simpleperf: add branch stack feature in perf.data."
Yabin Cui [Thu, 18 Jun 2015 05:21:12 +0000 (22:21 -0700)]
Simpleperf: add branch stack feature in perf.data.
Also add the function to remove old perf.data.
Bug:
19483574
Change-Id: I605bb637674d4674f95503a160de8c530fe87812
Yu Liu [Thu, 18 Jun 2015 17:46:29 +0000 (10:46 -0700)]
Swap column in procrank not reported with swap enabled
Yabin Cui [Thu, 18 Jun 2015 00:43:13 +0000 (00:43 +0000)]
am
b9408add: Merge "Simpleperf: add signal handler for SIGCHLD, SIGINT, SIGTERM."
* commit '
b9408add5aea2ce30602392602948ba9c364fe6e':
Simpleperf: add signal handler for SIGCHLD, SIGINT, SIGTERM.
Yabin Cui [Thu, 18 Jun 2015 00:16:50 +0000 (00:16 +0000)]
Merge "Simpleperf: add signal handler for SIGCHLD, SIGINT, SIGTERM."
Yabin Cui [Mon, 15 Jun 2015 23:17:20 +0000 (16:17 -0700)]
Simpleperf: add signal handler for SIGCHLD, SIGINT, SIGTERM.
And rely on signal to decide when to stop in record/stat command.
Bug:
19483574
Change-Id: I564cb61e74ea81cffe4de5b050482b3250ed9a06
Yabin Cui [Tue, 16 Jun 2015 02:20:59 +0000 (02:20 +0000)]
am
e040d594: Merge "Simpleperf: support callchain sampling in record command."
* commit '
e040d59401fbf8521d512aa5b7bc4e586a4cf1a8':
Simpleperf: support callchain sampling in record command.
Yabin Cui [Tue, 16 Jun 2015 01:55:15 +0000 (01:55 +0000)]
Merge "Simpleperf: support callchain sampling in record command."
Yabin Cui [Mon, 15 Jun 2015 21:36:43 +0000 (14:36 -0700)]
Simpleperf: support callchain sampling in record command.
Bug:
19483574
Change-Id: Icd8ed7c316144fc51d54f196872061533bdeef2b
Paul Lawrence [Fri, 12 Jun 2015 20:42:08 +0000 (20:42 +0000)]
am
2fa9e939: Retry polling to prevent failures
* commit '
2fa9e939581d944f0204291c53356d6b8c3a938f':
Retry polling to prevent failures
Paul Lawrence [Fri, 12 Jun 2015 20:06:21 +0000 (13:06 -0700)]
Retry polling to prevent failures
Change-Id: I182ee7f70c5a96bbcdb0fc9e35df67c45a937757
Yabin Cui [Fri, 12 Jun 2015 00:47:00 +0000 (00:47 +0000)]
am
decc11c6: Merge "Simpleperf: add option to print sample count in report command."
* commit '
decc11c6b5f88c72d2ca72be5efe6064f2176d1c':
Simpleperf: add option to print sample count in report command.
Yabin Cui [Fri, 12 Jun 2015 00:22:33 +0000 (00:22 +0000)]
Merge "Simpleperf: add option to print sample count in report command."
Yabin Cui [Thu, 11 Jun 2015 22:48:32 +0000 (22:48 +0000)]
am
ec9395d2: Merge "Simpleperf: improve records parsing."
* commit '
ec9395d2bebb43df9f99a3a785fb7aaf63fa2309':
Simpleperf: improve records parsing.
Yabin Cui [Thu, 11 Jun 2015 22:48:31 +0000 (22:48 +0000)]
am
e235e73b: Merge "Simpleperf: parse prefixed symbol of linker."
* commit '
e235e73b68c15a9931b82632bd237f464cc1993a':
Simpleperf: parse prefixed symbol of linker.
Yabin Cui [Thu, 11 Jun 2015 22:24:14 +0000 (22:24 +0000)]
Merge "Simpleperf: improve records parsing."
Yabin Cui [Thu, 11 Jun 2015 22:23:49 +0000 (22:23 +0000)]
Merge "Simpleperf: parse prefixed symbol of linker."
Yabin Cui [Thu, 11 Jun 2015 19:03:11 +0000 (12:03 -0700)]
Simpleperf: improve records parsing.
Sort records by time before handling.
Separate kernel space and user space sample records handling.
Bug:
19483574
Change-Id: I7722bb15678af18cbe883a2cf3fdac948bdd0c9f
Yabin Cui [Thu, 11 Jun 2015 21:57:21 +0000 (14:57 -0700)]
Simpleperf: parse prefixed symbol of linker.
Bug:
19483574
Change-Id: I2597d4a91fd9a6cfc5c15c8b637dc4ba5213ee56
Yabin Cui [Thu, 11 Jun 2015 21:28:01 +0000 (21:28 +0000)]
am
45f0817f: Merge "Simpleperf: always use the latest comm."
* commit '
45f0817f2c69214da96dc47f0694e9f62ba153ad':
Simpleperf: always use the latest comm.
Yabin Cui [Thu, 11 Jun 2015 21:28:00 +0000 (21:28 +0000)]
am
5585b0f7: Merge "Simpleperf: improve symbol parsing."
* commit '
5585b0f7328209d961d961c6a8616f5a395fb8c2':
Simpleperf: improve symbol parsing.
Yabin Cui [Thu, 11 Jun 2015 21:02:10 +0000 (14:02 -0700)]
Simpleperf: add option to print sample count in report command.
Also make output items left-aligned.
Bug:
19483574
Change-Id: I1b40a68d219a3fdd0ff3bf25a67c1a355201810a
Yabin Cui [Thu, 11 Jun 2015 21:05:31 +0000 (21:05 +0000)]
Merge "Simpleperf: always use the latest comm."
Yabin Cui [Thu, 11 Jun 2015 21:05:15 +0000 (21:05 +0000)]
Merge "Simpleperf: improve symbol parsing."
Yabin Cui [Thu, 11 Jun 2015 20:49:59 +0000 (13:49 -0700)]
Simpleperf: always use the latest comm.
Bug:
19483574
Change-Id: Ie314bdce7a61aeda679ea9d1bbe5e05436a22edc
Yabin Cui [Thu, 11 Jun 2015 18:15:42 +0000 (11:15 -0700)]
Simpleperf: improve symbol parsing.
Support c++ symbol demangling, and add option to disable it.
Add option to set symfs dir, so it can report on host.
Add label symbols, add add symbol length fixing for it.
Add two hacks about arm elf symbol parsing.
Bug:
19483574
Change-Id: I300d6c007c8634db382d0a50627b9cde1502df89
Than McIntosh [Thu, 11 Jun 2015 18:28:38 +0000 (18:28 +0000)]
am
22976122: Record device screen state and system load (from /proc/loadavg).
* commit '
2297612246852bd0993e949ceccafd4a36f3a053':
Record device screen state and system load (from /proc/loadavg).
Than McIntosh [Wed, 10 Jun 2015 15:47:01 +0000 (11:47 -0400)]
Record device screen state and system load (from /proc/loadavg).
Bug: http://b/
19483574
(cherry picked from commit
ebb946827ffbbb7df4c41be262a627c02bd95888)
Change-Id: I2a00e1fb075131e7d7d1a45c196ab0ac414e39c0
Than McIntosh [Thu, 11 Jun 2015 17:14:17 +0000 (17:14 +0000)]
am
ad475697: Merge "Record device screen state and system load (from /proc/loadavg)."
* commit '
ad47569766763512d45e51fb33483419aaee6f13':
Record device screen state and system load (from /proc/loadavg).
Than McIntosh [Thu, 11 Jun 2015 16:51:10 +0000 (16:51 +0000)]
Merge "Record device screen state and system load (from /proc/loadavg)."
Yabin Cui [Thu, 11 Jun 2015 02:31:44 +0000 (02:31 +0000)]
am
1dbbc532: Merge "Simpleperf: fix a few bugs."
* commit '
1dbbc5321bea27417221dc31edf0114bf26a3302':
Simpleperf: fix a few bugs.
Yabin Cui [Thu, 11 Jun 2015 02:31:43 +0000 (02:31 +0000)]
am
8782e1a0: Merge "Simpleperf: support symbol parsing in report command."
* commit '
8782e1a072dec91771279ae580fbbf541d3dd635':
Simpleperf: support symbol parsing in report command.
Yabin Cui [Thu, 11 Jun 2015 00:02:54 +0000 (00:02 +0000)]
Merge "Simpleperf: fix a few bugs."
Yabin Cui [Wed, 10 Jun 2015 23:58:53 +0000 (23:58 +0000)]
Merge "Simpleperf: support symbol parsing in report command."
Yabin Cui [Tue, 9 Jun 2015 20:38:42 +0000 (13:38 -0700)]
Simpleperf: fix a few bugs.
Fix mistyped word.
Kill workload process when exiting.
Add checking of whether branch sampling is supported.
Bug:
19483574
Change-Id: Ibe48914cd92da1ee40bf67c0c47a6376a7291e8c
Jeff Vander Stoep [Wed, 10 Jun 2015 23:16:02 +0000 (23:16 +0000)]
am
bb6fa058: Merge "Remove selinux/android.h from host tools" into mnc-dev
* commit '
bb6fa058895f5aafd025643b03b8ec6c778369f5':
Remove selinux/android.h from host tools
Jeff Vander Stoep [Wed, 10 Jun 2015 21:05:13 +0000 (21:05 +0000)]
Merge "Remove selinux/android.h from host tools" into mnc-dev
Jeff Vander Stoep [Wed, 13 May 2015 21:29:15 +0000 (14:29 -0700)]
Remove selinux/android.h from host tools
For tools built for both host and device, only include if not host.
(cherry-picked from commit
6bc4a54fdbd926c032ed5c99f8b5c69f624c6312)
Change-Id: Ie102bd7575d2cf5eef3f95e6063c2970d143dac8
Than McIntosh [Wed, 10 Jun 2015 15:47:01 +0000 (11:47 -0400)]
Record device screen state and system load (from /proc/loadavg).
Bug: http://b/
19483574
Change-Id: Ic0306ca9d7707c7e20158014e2c0a18b929afbc4
Ying Wang [Tue, 9 Jun 2015 23:00:04 +0000 (23:00 +0000)]
am
d31c4c3a: Merge "Exclude verify_boot_signature from Mac build." into mnc-dev
* commit '
d31c4c3a363b3b4b0018d81c2bdbcb15a06e5007':
Exclude verify_boot_signature from Mac build.
Ying Wang [Tue, 9 Jun 2015 22:33:59 +0000 (22:33 +0000)]
Merge "Exclude verify_boot_signature from Mac build." into mnc-dev
Ying Wang [Tue, 9 Jun 2015 22:26:35 +0000 (15:26 -0700)]
Exclude verify_boot_signature from Mac build.
verify_boot_signature doesn't build on Mac currently.
Temporarily exclude it from Mac build.
Bug:
21669400
Change-Id: I7b978adafefb700d65f6fc10f69c949fce94c236
Yabin Cui [Mon, 8 Jun 2015 17:38:10 +0000 (10:38 -0700)]
Simpleperf: support symbol parsing in report command.
Also fix the storage of ProcessEntry.
Bug:
19483574
Change-Id: I2182a804f6ecbd28e7aa3c1a38a6f19b86f583c9
Todd Kjos [Tue, 9 Jun 2015 14:47:42 +0000 (14:47 +0000)]
am
d0fefb84: fix chrome activity name in systemapps.sh
* commit '
d0fefb8421a9cb57ac27d0d4fcf3abe938fcf2d1':
fix chrome activity name in systemapps.sh
Todd Kjos [Tue, 9 Jun 2015 00:48:08 +0000 (17:48 -0700)]
fix chrome activity name in systemapps.sh
the activity name for chrome changed recently which broke
systemapps.sh for some devices/builds. This change removes
the dependance on the chrome activity name in systemapps.sh
Change-Id: I7f194a5c60221650300b6ab0df526f5bdf4b7f79
Yabin Cui [Mon, 8 Jun 2015 21:38:26 +0000 (21:38 +0000)]
am
f7383f39: Merge "Simpleperf: remove overlapped user map in SampleTree."
* commit '
f7383f39e5a66731e6e34ca85c1ad599f39faf1d':
Simpleperf: remove overlapped user map in SampleTree.
Yabin Cui [Mon, 8 Jun 2015 21:17:42 +0000 (21:17 +0000)]
Merge "Simpleperf: remove overlapped user map in SampleTree."
Yabin Cui [Mon, 8 Jun 2015 20:08:12 +0000 (20:08 +0000)]
am
7a0eebab: Merge "Simpleperf: adjust report width based on requirement."
* commit '
7a0eebab656d3c5b1f843adffbd491681bcd4bd6':
Simpleperf: adjust report width based on requirement.
Yabin Cui [Mon, 8 Jun 2015 19:32:06 +0000 (19:32 +0000)]
Merge "Simpleperf: adjust report width based on requirement."
Yabin Cui [Mon, 8 Jun 2015 19:27:19 +0000 (12:27 -0700)]
Simpleperf: remove overlapped user map in SampleTree.
If a new map overlapps with some old maps, the overlapped old
maps are not valid any more and should be removed.
Bug:
19483574
Change-Id: Ie5df5073d0c8c3727ab05163ef27537618bb416e
Yabin Cui [Mon, 8 Jun 2015 18:09:11 +0000 (11:09 -0700)]
Simpleperf: adjust report width based on requirement.
Bug:
19483574
Change-Id: I01fadd50090aea67cda5009c5f4c2d8d780fc616
Yabin Cui [Sat, 6 Jun 2015 03:18:33 +0000 (03:18 +0000)]
am
4f9a042a: Merge "Add simpleperf report command."
* commit '
4f9a042a60dcdb7492c1372cc3c973e3eda8a0ab':
Add simpleperf report command.
Yabin Cui [Sat, 6 Jun 2015 02:58:49 +0000 (02:58 +0000)]
Merge "Add simpleperf report command."
Todd Kjos [Fri, 5 Jun 2015 23:55:46 +0000 (23:55 +0000)]
am
643233de: Add -W option to systemapps.sh
* commit '
643233ded9075628010c16feb8d2401ade3ae62c':
Add -W option to systemapps.sh
Todd Kjos [Fri, 5 Jun 2015 21:56:54 +0000 (14:56 -0700)]
Add -W option to systemapps.sh
Changes the wait time between apps. Example; "./systemapps.sh -W 1.2"
Change-Id: I3769aa93ebbcd129de2f3fa3df99720e1d83b2f9
Todd Kjos [Fri, 5 Jun 2015 21:56:41 +0000 (21:56 +0000)]
am
8b6cf279: Merge "Enhancements to workload scripts" into mnc-dev
* commit '
8b6cf2796dc179b339b12e52d17b56d2519358fe':
Enhancements to workload scripts
Todd Kjos [Fri, 5 Jun 2015 21:32:36 +0000 (21:32 +0000)]
Merge "Enhancements to workload scripts" into mnc-dev
Todd Kjos [Fri, 5 Jun 2015 20:28:46 +0000 (13:28 -0700)]
Enhancements to workload scripts
- display frame latencies (90th/95th/99th) for recents and systemapps
- allow device type to be specified to capture
- workaround for am hang when starting chrome on volantis
- bullhead support for recentfling
New output of "recentfling.sh":
Fling recents...
Frames: 772 latency: 19/22/34 Janks: 131(16%)
New output of "systemapps.sh -T":
App Start(ms) Iter(ms) Jank Latency
gmail 1090 2168 69(72%) 65/75/88
hangouts 1757 2758 60(82%) 69/111/114
chrome 0 997 59(64%) 68/77/84
youtube 3533 4834 140(48%) 70/93/150
play 1868 3147 92(62%) 89/106/182
home 0 1125 210(15%) 62/84/129
TOTAL 8248 35052
Change-Id: If4fc94ab0188dae2afabfbf696be06b6ddf55ce1
Yabin Cui [Thu, 21 May 2015 19:17:23 +0000 (12:17 -0700)]
Add simpleperf report command.
Only support report of process/file level. Symbol parsing is not included.
Bug:
19483574
Change-Id: I6d1c67000bd0e303623183912ff06fdeeb51c5e9
Yabin Cui [Fri, 5 Jun 2015 02:04:41 +0000 (02:04 +0000)]
am
ed6f7968: Merge "Simpleperf: refactor command system."
* commit '
ed6f79688c581fcc5962de774838f052c4ad04cd':
Simpleperf: refactor command system.
Yabin Cui [Fri, 5 Jun 2015 01:41:28 +0000 (01:41 +0000)]
Merge "Simpleperf: refactor command system."
Yabin Cui [Mon, 1 Jun 2015 18:21:37 +0000 (11:21 -0700)]
Simpleperf: refactor command system.
Register a callback function to create a new command instance instead of
registering a command instance. Then we can release resources in the
command destructors, and don't need xxxCommandImpl classes any more.
Bug:
19483574
Change-Id: Ibb54892ec0655fd43909347afd72bb08bc8a716c
Paul Lawrence [Thu, 4 Jun 2015 21:53:46 +0000 (21:53 +0000)]
am
b411bcc1: Move crypt commands to a different listener in vold
* commit '
b411bcc138293db5e09c1f5af638115b3c7c18f8':
Move crypt commands to a different listener in vold
Yabin Cui [Thu, 4 Jun 2015 02:46:58 +0000 (02:46 +0000)]
am
d4637d6e: Merge "Simpleperf: support branch stack sampling in `simpleperf record`."
* commit '
d4637d6e7d17f48d9325fa133be82b06a408f523':
Simpleperf: support branch stack sampling in `simpleperf record`.
Yabin Cui [Thu, 4 Jun 2015 02:22:59 +0000 (02:22 +0000)]
Merge "Simpleperf: support branch stack sampling in `simpleperf record`."
Yabin Cui [Wed, 3 Jun 2015 00:54:52 +0000 (17:54 -0700)]
Simpleperf: support branch stack sampling in `simpleperf record`.
This only adds support in simpleperf. Branch stack sampling still
lacks kernel support on arm devices.
Use perf_event.h of bionic in host build, because the perf_event.h
of platform glibc is too old.
Bug:
19483574
Change-Id: I9c7332c054e93e7433717dd293d3f366b1802e2d
Paul Lawrence [Wed, 3 Jun 2015 21:18:17 +0000 (14:18 -0700)]
Move crypt commands to a different listener in vold
In order to prevent this bug from happening, we must allow vold cryptfs
commands to complete while a long running mount is underway.
While waiting for vold to be changed to a binder interface, we will simply
create two listeners, one for cryptfs and one for everything else.
Bug:
19197175
Change-Id: Id87764ed68c169fc6b94ea4f4f7a51a7ec9c7564
Paul Lawrence [Mon, 1 Jun 2015 15:28:34 +0000 (15:28 +0000)]
am
af02e8aa: DO NOT MERGE New faster file open kernel
* commit '
af02e8aa9164f723a0c2a421a97c227c5adff4c2':
DO NOT MERGE New faster file open kernel
Paul Lawrence [Mon, 1 Jun 2015 15:28:33 +0000 (15:28 +0000)]
am
a47a1331: DO NOT MERGE Use default key permissions for ext4enc
* commit '
a47a1331f75433fe25e3f57ffdecea92f7e48425':
DO NOT MERGE Use default key permissions for ext4enc
Paul Lawrence [Mon, 1 Jun 2015 15:28:31 +0000 (15:28 +0000)]
am
2ecc6428: DO NOT MERGE Enable properties in ext4enc
* commit '
2ecc64285a67bad1f942581f5bd9f361d689d37c':
DO NOT MERGE Enable properties in ext4enc
Yabin Cui [Fri, 29 May 2015 23:51:24 +0000 (23:51 +0000)]
am
34bce194: Merge "Simpleperf: add test about cpu hot-plug."
* commit '
34bce194a474083a3e156de8ffb0daf4fd27e005':
Simpleperf: add test about cpu hot-plug.
Yabin Cui [Fri, 29 May 2015 23:21:18 +0000 (23:21 +0000)]
Merge "Simpleperf: add test about cpu hot-plug."
Yabin Cui [Fri, 29 May 2015 02:57:01 +0000 (19:57 -0700)]
Simpleperf: add test about cpu hot-plug.
On device like N7(flo), because of a kernel bug, if a cpu is hotplugged
while there are hardware events monitored not on that cpu, the kernel
arrives in an error state that no further hardware events can be monitored.
This test is used to detect the kernel bug.
Bug:
19863147
Change-Id: Ieed4fef174373b5fe62afacf8197e839685893df
Paul Lawrence [Fri, 1 May 2015 12:24:04 +0000 (05:24 -0700)]
DO NOT MERGE New faster file open kernel
(chery-picked from commit
b01dc1c52ec0a4ec5e07a18ffb5b105a997cc329)
Bug:
18151196
Change-Id: Icdb3d9afa1db125102d01cd06f45dbc99ca78021
Paul Lawrence [Tue, 5 May 2015 18:06:43 +0000 (11:06 -0700)]
DO NOT MERGE Use default key permissions for ext4enc
(cherry-picked from commit
478a01d6f2081f7807b99774d005fee373847f23)
As per discussion default permissions are the correct ones.
Note that since we use logon keys, they cannot be read outside
the kernel.
Note also that we limit who can read/write keys in selinux policy.
Bug:
18151196
Change-Id: I15dc0de92643ae1472b0cde79c464fb3e1a1d453
Paul Lawrence [Wed, 15 Apr 2015 21:11:07 +0000 (14:11 -0700)]
DO NOT MERGE Enable properties in ext4enc
(cherry-picked from commit
829e6413348e1d1569b32a604484b4ace3083776)
Enables OwnerInfo and pattern suppression
Change-Id: I4a7d71c9a750d5ed996ab1937bd5a81da480a2b3
Paul Lawrence [Fri, 29 May 2015 21:08:33 +0000 (21:08 +0000)]
am
db1d49c7: (-s ours) DO NOT MERGE New ext4enc kernel switching from xattrs to ioctl
* commit '
db1d49c70eec489cf3d60a4ec70a8e7c0f3f2b76':
DO NOT MERGE New ext4enc kernel switching from xattrs to ioctl
Paul Lawrence [Fri, 29 May 2015 21:02:36 +0000 (21:02 +0000)]
am
bc2eb8c3: (-s ours) DO NOT MERGE Securely encrypt the master key
* commit '
bc2eb8c3fd621605ff1ccaed04a71e6685acc974':
DO NOT MERGE Securely encrypt the master key
Paul Lawrence [Fri, 10 Apr 2015 14:47:30 +0000 (07:47 -0700)]
DO NOT MERGE New ext4enc kernel switching from xattrs to ioctl
(cherry-picked from commit
9f53fb4abca1ee3af7b537c95445161db4b81f86)
This is one of three changes to enable this functionality:
https://android-review.googlesource.com/#/c/146259/
https://android-review.googlesource.com/#/c/146264/
https://android-review.googlesource.com/#/c/146265/
Bug:
18151196
Change-Id: I05b96f49b8848e82484a500e4536bdb4d2cdd635
Paul Lawrence [Tue, 28 Apr 2015 22:13:04 +0000 (22:13 +0000)]
DO NOT MERGE Securely encrypt the master key
(cherry-picked from commit
377cd1957172c19ee21baa3d6bda0840f1ce020d)
Move all key management into vold
Reuse vold's existing key management through the crypto footer
to manage the device wide keys.
Use ro.crypto.type flag to determine crypto type, which prevents
any issues when running in block encrypted mode, as well as speeding
up boot in block or no encryption.
This is one of four changes to enable this functionality:
https://android-review.googlesource.com/#/c/148586/
https://android-review.googlesource.com/#/c/148604/
https://android-review.googlesource.com/#/c/148606/
https://android-review.googlesource.com/#/c/148607/
Bug:
18151196
Change-Id: I7a4ef3f3a937c45ff18f17c9ad1398293a8630f3
Than McIntosh [Thu, 28 May 2015 17:30:49 +0000 (17:30 +0000)]
am
14d9b4f1: Perfprofd: various changes related to config parameters.
* commit '
14d9b4f16be91459e1ab8421fd8f2ec273d05cf3':
Perfprofd: various changes related to config parameters.
Todd Kjos [Thu, 28 May 2015 17:30:29 +0000 (17:30 +0000)]
am
4d31f7f2: Fix hang when starting chrome
* commit '
4d31f7f204b2441cb7cc742910d94c2f1054d660':
Fix hang when starting chrome
Than McIntosh [Thu, 28 May 2015 17:19:33 +0000 (17:19 +0000)]
am
50e2e1d1: Merge "Perfprofd: various changes related to config parameters."
* commit '
50e2e1d1918e2400745cb1c6e5d34acd33d5c2fe':
Perfprofd: various changes related to config parameters.
Elliott Hughes [Thu, 28 May 2015 17:19:19 +0000 (17:19 +0000)]
am
421d4546: Merge "Set -fno-strict-aliasing here so we can get rid of it globally"
* commit '
421d454684235a7e9e20de43f22e70decc038c52':
Set -fno-strict-aliasing here so we can get rid of it globally
Than McIntosh [Thu, 21 May 2015 18:44:34 +0000 (14:44 -0400)]
Perfprofd: various changes related to config parameters.
Details:
- turn "max unprocessed profiles" into a configurable parameter.
- use a longer default collection interval
- reread config file on very iteration through the main loop,
so as to incorporate new parameters written by the upload service
Bug: http://b/
19483574
Change-Id: I1ecacbdeccf26f09ddd8387aef0f2587483eb967
(cherry picked from commit
f353d8bf370eab2117e6259630f5540f12b361b0)
Todd Kjos [Thu, 28 May 2015 15:27:00 +0000 (08:27 -0700)]
Fix hang when starting chrome
Stop using the activity string and always use theverge.com
Change-Id: I22efebe83e8baffecd2a8510ec75c9269f1c24ef
Than McIntosh [Thu, 28 May 2015 13:23:38 +0000 (13:23 +0000)]
Merge "Perfprofd: various changes related to config parameters."
Elliott Hughes [Thu, 28 May 2015 05:28:07 +0000 (05:28 +0000)]
Merge "Set -fno-strict-aliasing here so we can get rid of it globally"
Than McIntosh [Thu, 21 May 2015 18:44:34 +0000 (14:44 -0400)]
Perfprofd: various changes related to config parameters.
Details:
- turn "max unprocessed profiles" into a configurable parameter.
- use a longer default collection interval
- reread config file on very iteration through the main loop,
so as to incorporate new parameters written by the upload service
Bug: http://b/
19483574
Change-Id: I1ecacbdeccf26f09ddd8387aef0f2587483eb967
Lorenzo Colitti [Fri, 22 May 2015 15:16:30 +0000 (15:16 +0000)]
am
8e9233ec: Merge "Make mark reflect/accept required, it\'s been upstream for a while."
* commit '
8e9233ecabd3ca4a7ae927cb2cdb6e80e8cf01bd':
Make mark reflect/accept required, it's been upstream for a while.
Lorenzo Colitti [Fri, 22 May 2015 05:43:59 +0000 (05:43 +0000)]
Merge "Make mark reflect/accept required, it's been upstream for a while."
Lorenzo Colitti [Fri, 22 May 2015 00:49:31 +0000 (09:49 +0900)]
Make mark reflect/accept required, it's been upstream for a while.
Change-Id: I4a329ef59987a6414293ececcf9ed87466c3cadd
Todd Kjos [Thu, 21 May 2015 18:48:36 +0000 (18:48 +0000)]
am
684f65f8: Scripts to automate simple workloads for testing
* commit '
684f65f8602d1e1a79170984acc18421fb8f4c98':
Scripts to automate simple workloads for testing
Todd Kjos [Wed, 20 May 2015 19:47:00 +0000 (12:47 -0700)]
Scripts to automate simple workloads for testing
DO NOT MERGE (already in master)
The initial set of scripts:
recentsfling.sh : start a set of apps, switch to recents and fling
systemapps.sh : start a set of apps, and then loop to move them
to the forground, checking whether the app had
been LMK'd or required direct reclaims
feedly-chrome.sh : automate a feedly, chrome
workflow making sure both stay in memory
Change-Id: I40f0862623ea0963bb0eaed3a585b41b69bbbbc7
OSDN Git Service
