OSDN Git Service

android-x86/system-extras.git
9 years agoSimpleperf: always use the latest comm.
Yabin Cui [Thu, 11 Jun 2015 20:49:59 +0000 (13:49 -0700)]
Simpleperf: always use the latest comm.

Bug: 19483574
Change-Id: Ie314bdce7a61aeda679ea9d1bbe5e05436a22edc

9 years agoMerge "Simpleperf: fix a few bugs."
Yabin Cui [Thu, 11 Jun 2015 00:02:54 +0000 (00:02 +0000)]
Merge "Simpleperf: fix a few bugs."

9 years agoMerge "Simpleperf: support symbol parsing in report command."
Yabin Cui [Wed, 10 Jun 2015 23:58:53 +0000 (23:58 +0000)]
Merge "Simpleperf: support symbol parsing in report command."

9 years agoSimpleperf: fix a few bugs.
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

9 years agoSimpleperf: support symbol parsing in report command.
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

9 years agoMerge "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."

9 years agoMerge "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."

9 years agoSimpleperf: remove overlapped user map in SampleTree.
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

9 years agoSimpleperf: adjust report width based on requirement.
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

9 years agoMerge "Add simpleperf report command."
Yabin Cui [Sat, 6 Jun 2015 02:58:49 +0000 (02:58 +0000)]
Merge "Add simpleperf report command."

9 years agoAdd simpleperf report command.
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

9 years agoMerge "Simpleperf: refactor command system."
Yabin Cui [Fri, 5 Jun 2015 01:41:28 +0000 (01:41 +0000)]
Merge "Simpleperf: refactor command system."

9 years agoSimpleperf: 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

9 years agoMerge "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`."

9 years agoSimpleperf: 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

9 years agoMerge "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."

9 years agoSimpleperf: 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

9 years agoMerge "Perfprofd: various changes related to config parameters."
Than McIntosh [Thu, 28 May 2015 13:23:38 +0000 (13:23 +0000)]
Merge "Perfprofd: various changes related to config parameters."

9 years agoMerge "Set -fno-strict-aliasing here so we can get rid of it globally"
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"

9 years agoPerfprofd: various changes related to config parameters.
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

9 years agoMerge "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."

9 years agoMake 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

9 years agoMerge "Disable certain kernel configuration options in net_test."
Lorenzo Colitti [Wed, 20 May 2015 07:06:40 +0000 (07:06 +0000)]
Merge "Disable certain kernel configuration options in net_test."

9 years agoDisable certain kernel configuration options in net_test.
Lorenzo Colitti [Wed, 20 May 2015 06:53:30 +0000 (15:53 +0900)]
Disable certain kernel configuration options in net_test.

- Support disabling as well as enabling configuration options
- Disable two options that break the flo kernel when compiling
  with a recent GCC.

Change-Id: Ic8824c0de997bb479f44d9ec35c1d1d2f6fc344b

9 years agoSet -fno-strict-aliasing here so we can get rid of it globally
Bernhard Rosenkränzer [Tue, 19 May 2015 21:49:59 +0000 (23:49 +0200)]
Set -fno-strict-aliasing here so we can get rid of it globally

Add -fno-strict-aliasing to the compiler flags where it is actually
needed so we can get rid of the flag globally -- without it, compilers
can optimize better.

Change-Id: Ia574120ee231503ce364ee377506115fd41f0a48
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
9 years agoMerge "Don't use TEMP_FAILURE_RETRY with close in system/extras."
Elliott Hughes [Sat, 16 May 2015 01:11:07 +0000 (01:11 +0000)]
Merge "Don't use TEMP_FAILURE_RETRY with close in system/extras."

9 years agoMerge "Support tracepoint event types in simpleperf."
Yabin Cui [Sat, 16 May 2015 00:42:23 +0000 (00:42 +0000)]
Merge "Support tracepoint event types in simpleperf."

9 years agoDon't use TEMP_FAILURE_RETRY with close in system/extras.
Elliott Hughes [Sat, 16 May 2015 00:20:47 +0000 (17:20 -0700)]
Don't use TEMP_FAILURE_RETRY with close in system/extras.

Bug: http://b/20501816
Change-Id: I32123049314a30a255fdf1a76a0e00bd35ac8801

9 years agoSupport tracepoint event types in simpleperf.
Yabin Cui [Thu, 30 Apr 2015 16:43:26 +0000 (09:43 -0700)]
Support tracepoint event types in simpleperf.

Also support options in `simpleperf list`, add test about tracepoint event types.

Bug: 19483574

Change-Id: I2d2c2f300fe5e2968696228899084410aa9f29a4

9 years agoMerge "Remove selinux/android.h from host tools"
Jeff Vander Stoep [Thu, 14 May 2015 15:27:13 +0000 (15:27 +0000)]
Merge "Remove selinux/android.h from host tools"

9 years agoMerge "Add sequence number to encoded perf.data file."
Elliott Hughes [Thu, 14 May 2015 00:24:22 +0000 (00:24 +0000)]
Merge "Add sequence number to encoded perf.data file."

9 years agoMerge "Dump build_id feature in `simpleperf record`."
Yabin Cui [Wed, 13 May 2015 23:33:54 +0000 (23:33 +0000)]
Merge "Dump build_id feature in `simpleperf record`."

9 years agoDump build_id feature in `simpleperf record`.
Yabin Cui [Wed, 6 May 2015 02:58:07 +0000 (19:58 -0700)]
Dump build_id feature in `simpleperf record`.

Bug: 19483574
Change-Id: Ie2acd8a157bca9ad3c01a2e4b37e139aba89670f

9 years agoRemove selinux/android.h from host tools
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.

Change-Id: Ie102bd7575d2cf5eef3f95e6063c2970d143dac8

9 years agoAdd sequence number to encoded perf.data file.
Dehao Chen [Thu, 7 May 2015 20:16:35 +0000 (13:16 -0700)]
Add sequence number to encoded perf.data file.

Bug: 19483574
Change-Id: I49e313f295ebc4ea3f994634676aa6d5f6798a82

9 years agoMerge "Fix unused result warnings in system/extras/verity."
Elliott Hughes [Wed, 13 May 2015 17:03:55 +0000 (17:03 +0000)]
Merge "Fix unused result warnings in system/extras/verity."

9 years agoFix unused result warnings in system/extras/verity.
Elliott Hughes [Wed, 13 May 2015 04:34:57 +0000 (21:34 -0700)]
Fix unused result warnings in system/extras/verity.

This lets us turn on _FORTIFY_SOURCE=2 for the host.

Bug: http://b/20558757
Change-Id: Iea7761874b0ccc68920c4d90889e83281155e52b

9 years agoMerge "Improve netlink message debugging."
Lorenzo Colitti [Wed, 13 May 2015 08:46:08 +0000 (08:46 +0000)]
Merge "Improve netlink message debugging."

9 years agoImprove netlink message debugging.
Lorenzo Colitti [Wed, 13 May 2015 01:57:43 +0000 (10:57 +0900)]
Improve netlink message debugging.

1. Add a method to convert a message to a string. The code didn't
   have anything that did just that; all string conversions were
   part of the debugging code. This method can be used by
   external callers that just want to parse raw messages obtained
   by other means (e.g., strace).
2. Teach the code about FRA_FWMASK.
3. Fix a bug in the parsing error handling due to attempting to
   catch the wrong exception.

Also fix a couple of lint errors.

Change-Id: I1915ab984934810ddbef7040c78d58e8657bb028

9 years agoMerge "system/extra: include more of what you use."
Kenny Root [Tue, 12 May 2015 22:41:13 +0000 (22:41 +0000)]
Merge "system/extra: include more of what you use."

9 years agoMerge "Don't apply default encryption to /data/user, it should get per-user encryption."
Paul Crowley [Tue, 12 May 2015 12:56:49 +0000 (12:56 +0000)]
Merge "Don't apply default encryption to /data/user, it should get per-user encryption."

9 years agosystem/extra: include more of what you use.
Adam Langley [Mon, 11 May 2015 19:17:25 +0000 (12:17 -0700)]
system/extra: include more of what you use.

This is a reland of aa24bc89b78a5981df7618bdef78b7b49ffad14d which was
reverted in 291e20dab39783c7074191ff2d2de9b86465c10f because it broke
the git_master-gpl builder.

This version of the change uses crypto.h as a proxy for mem.h because
it'll work in both BoringSSL and OpenSSL.

Change-Id: I9e4c9e4d459c2e31f74180b3a3b2ab139ab76e80

9 years agoDon't apply default encryption to /data/user, it should get per-user
Paul Crowley [Wed, 6 May 2015 14:28:35 +0000 (15:28 +0100)]
Don't apply default encryption to /data/user, it should get per-user
encryption.

Bug: 19704432
Change-Id: I4eb8b6a966c3923f5222dfc068d7a3aef2b23adb

9 years agoMerge "Revert "system/extra: include more of what you use.""
Kenny Root [Sat, 9 May 2015 23:56:31 +0000 (23:56 +0000)]
Merge "Revert "system/extra: include more of what you use.""

9 years agoRevert "system/extra: include more of what you use."
Kenny Root [Sat, 9 May 2015 23:56:12 +0000 (23:56 +0000)]
Revert "system/extra: include more of what you use."

This reverts commit aa24bc89b78a5981df7618bdef78b7b49ffad14d.

Change-Id: If55eb0effc582f1cfa329bab8d7504ad4964f67e

9 years agoMerge "system/extra: include more of what you use."
Kenny Root [Sat, 9 May 2015 14:55:03 +0000 (14:55 +0000)]
Merge "system/extra: include more of what you use."

9 years agoMerge "Support dumping neighbour cache entries."
Lorenzo Colitti [Fri, 8 May 2015 08:45:36 +0000 (08:45 +0000)]
Merge "Support dumping neighbour cache entries."

9 years agoSupport dumping neighbour cache entries.
Lorenzo Colitti [Fri, 8 May 2015 07:41:57 +0000 (16:41 +0900)]
Support dumping neighbour cache entries.

Change-Id: I69675c9d8ee4a8c6e2daf4bbe60d9858855019ea

9 years agoMerge "Separate the destination directory to /data/misc/perfprofd. Remove reading...
Elliott Hughes [Thu, 7 May 2015 04:14:34 +0000 (04:14 +0000)]
Merge "Separate the destination directory to /data/misc/perfprofd. Remove reading of aux-config."

9 years agoSeparate the destination directory to /data/misc/perfprofd.
Dehao Chen [Tue, 5 May 2015 22:03:48 +0000 (15:03 -0700)]
Separate the destination directory to /data/misc/perfprofd.
Remove reading of aux-config.

Bug: 19483574

Change-Id: Ie99d522d37e8688febc7f324502ca68150dd235c

9 years agosystem/extra: include more of what you use.
Adam Langley [Tue, 28 Apr 2015 20:20:26 +0000 (13:20 -0700)]
system/extra: include more of what you use.

Historically, the OpenSSL/BoringSSL headers have been quite sloppy:
including many system headers. Over time, code has grown to depend on
this.

BoringSSL has cleaned things up a bit, but that requires code like this
to include what it uses.

Change-Id: Id456a598151d4c58a73cf05cef46f3db296e1f39

9 years agoMerge "Dump kernel/modules/thread mmap information in `simpleperf record`."
Yabin Cui [Tue, 5 May 2015 22:21:11 +0000 (22:21 +0000)]
Merge "Dump kernel/modules/thread mmap information in `simpleperf record`."

9 years agoDump kernel/modules/thread mmap information in `simpleperf record`.
Yabin Cui [Tue, 5 May 2015 03:27:57 +0000 (20:27 -0700)]
Dump kernel/modules/thread mmap information in `simpleperf record`.

Bug: 19483574
Change-Id: Ia65cb12804a6dffa440501736a6229b2f7248958

9 years agoMerge changes I15dc0de9,Icdb3d9af
Paul Lawrence [Tue, 5 May 2015 20:18:23 +0000 (20:18 +0000)]
Merge changes I15dc0de9,Icdb3d9af

* changes:
  Use default key permissions for ext4enc
  New faster file open kernel

9 years agoUse default key permissions for ext4enc
Paul Lawrence [Tue, 5 May 2015 18:06:43 +0000 (11:06 -0700)]
Use default key permissions for ext4enc

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

9 years agoNew faster file open kernel
Paul Lawrence [Fri, 1 May 2015 12:24:04 +0000 (05:24 -0700)]
New faster file open kernel

Bug: 18151196

Change-Id: Icdb3d9afa1db125102d01cd06f45dbc99ca78021

9 years agoMerge "Change the encoded file's mode to be readable by GMS core."
Elliott Hughes [Tue, 5 May 2015 00:56:09 +0000 (00:56 +0000)]
Merge "Change the encoded file's mode to be readable by GMS core."

9 years agoChange the encoded file's mode to be readable by GMS core.
Dehao Chen [Mon, 4 May 2015 23:08:00 +0000 (16:08 -0700)]
Change the encoded file's mode to be readable by GMS core.

Bug: 19483574
Change-Id: Iee89138520a657df9a02bc98217c311d8c5a9262

9 years agoMerge "Implement simpleperf record/dumprecord subcommands."
Yabin Cui [Mon, 4 May 2015 22:47:15 +0000 (22:47 +0000)]
Merge "Implement simpleperf record/dumprecord subcommands."

9 years agoImplement simpleperf record/dumprecord subcommands.
Yabin Cui [Tue, 28 Apr 2015 22:54:13 +0000 (15:54 -0700)]
Implement simpleperf record/dumprecord subcommands.

Bug: 19483574

Change-Id: Id879713a75c2d3a6289d8847b95ee0bb4a2cc8a0

9 years agoMerge "Fix asan error when copying super block to backup super blocks"
Colin Cross [Sun, 3 May 2015 21:17:40 +0000 (21:17 +0000)]
Merge "Fix asan error when copying super block to backup super blocks"

9 years agoFix asan error when copying super block to backup super blocks
Colin Cross [Sun, 3 May 2015 21:09:52 +0000 (14:09 -0700)]
Fix asan error when copying super block to backup super blocks

Address santizier caught a bug where we memcpy a full block size into
the backup super block, but the source may be offset 1024 bytes into
a block size allocation.  The destination buffer is zeroed by calloc,
so just copy the super block size instead.

Change-Id: I87af8e3349a63940905697466f62532c50fab720

9 years agoMerge "Enable properties in ext4enc"
Paul Lawrence [Fri, 1 May 2015 14:44:42 +0000 (14:44 +0000)]
Merge "Enable properties in ext4enc"

9 years agoMerge "Update simpleperf path to /system/xbin/simpleperf."
Elliott Hughes [Thu, 30 Apr 2015 17:56:52 +0000 (17:56 +0000)]
Merge "Update simpleperf path to /system/xbin/simpleperf."

9 years agoUpdate simpleperf path to /system/xbin/simpleperf.
Dehao Chen [Thu, 30 Apr 2015 17:54:26 +0000 (10:54 -0700)]
Update simpleperf path to /system/xbin/simpleperf.

Change-Id: Ib326b1669553146e028c8354bb5077176d150616

9 years agoEnable properties in ext4enc
Paul Lawrence [Wed, 15 Apr 2015 21:11:07 +0000 (14:11 -0700)]
Enable properties in ext4enc

Enables OwnerInfo and pattern suppression

Change-Id: I4a7d71c9a750d5ed996ab1937bd5a81da480a2b3

9 years agoMerge "New ext4enc kernel switching from xattrs to ioctl"
Paul Lawrence [Thu, 30 Apr 2015 16:28:50 +0000 (16:28 +0000)]
Merge "New ext4enc kernel switching from xattrs to ioctl"

9 years agoNew ext4enc kernel switching from xattrs to ioctl
Paul Lawrence [Fri, 10 Apr 2015 14:47:30 +0000 (07:47 -0700)]
New ext4enc kernel switching from xattrs to ioctl

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

9 years agoMerge "Switch perfprofd from using full to lite version of protobuf library."
Elliott Hughes [Thu, 30 Apr 2015 00:49:16 +0000 (00:49 +0000)]
Merge "Switch perfprofd from using full to lite version of protobuf library."

9 years agoMerge "Default the config file to NULL for perfprofd, so that we will not see error...
Elliott Hughes [Wed, 29 Apr 2015 22:06:44 +0000 (22:06 +0000)]
Merge "Default the config file to NULL for perfprofd, so that we will not see error in logcat when config file is not specified."

9 years agoDefault the config file to NULL for perfprofd, so that we will not see error in logca...
Dehao Chen [Wed, 29 Apr 2015 20:31:48 +0000 (13:31 -0700)]
Default the config file to NULL for perfprofd, so that we will not see error in logcat when config file is not specified.

Change-Id: Ib6a442726b687f8aaec27dee30962cf3cc820918

9 years agoSwitch perfprofd from using full to lite version of protobuf library.
Than McIntosh [Wed, 29 Apr 2015 18:48:32 +0000 (14:48 -0400)]
Switch perfprofd from using full to lite version of protobuf library.

Change-Id: Ie4cf7cd2e6e4f90bcdba39200c856c219b710065

9 years agoMerge "Securely encrypt the master key"
Paul Lawrence [Wed, 29 Apr 2015 16:24:25 +0000 (16:24 +0000)]
Merge "Securely encrypt the master key"

9 years agoMerge "make_ext4fs: write out super blocks at last for block devices"
Colin Cross [Wed, 29 Apr 2015 00:38:58 +0000 (00:38 +0000)]
Merge "make_ext4fs: write out super blocks at last for block devices"

9 years agomake_ext4fs: write out super blocks at last for block devices
Eric Miao [Thu, 16 Apr 2015 22:00:11 +0000 (15:00 -0700)]
make_ext4fs: write out super blocks at last for block devices

Change-Id: I93ee37a649aabff14464030efd88f79e1ae324f0
Signed-off-by: Eric Miao <emiao@nvidia.com>
9 years agoSecurely encrypt the master key
Paul Lawrence [Tue, 28 Apr 2015 22:13:04 +0000 (22:13 +0000)]
Securely encrypt the master key

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

9 years agoMerge "Add real UUID support to ext4_utils."
Colin Cross [Tue, 28 Apr 2015 22:05:34 +0000 (22:05 +0000)]
Merge "Add real UUID support to ext4_utils."

9 years agoAdd real UUID support to ext4_utils.
Jeff Sharkey [Tue, 7 Apr 2015 05:29:04 +0000 (22:29 -0700)]
Add real UUID support to ext4_utils.

For some unknown reason, we've always been generating the same UUID
for every single ext4 partition that we formatted.  Yikes.

Add a flag to request that a real UUID be generated when creating
filesystem.

(cherry-picked from 7538cc97e1695608123739d6ef8ff2ee1572aaec)

Bug: 19993667
Change-Id: I6f3f6aa373021cb8b6779e5354ac36436c4d98d3

9 years agoMerge "Revert "Securely encrypt the master key""
Paul Lawrence [Tue, 28 Apr 2015 19:16:07 +0000 (19:16 +0000)]
Merge "Revert "Securely encrypt the master key""

9 years agoRevert "Securely encrypt the master key"
Paul Lawrence [Tue, 28 Apr 2015 19:15:58 +0000 (19:15 +0000)]
Revert "Securely encrypt the master key"

This reverts commit af2359fdc4a45fcf482d1a316bae1fff226c425b.

Change-Id: Icd4d04adf5c0728357caa6eb225b9a08fd0ad552

9 years agoMerge "Build simpleperf in user-debug mode, and put it in /system/xbin/."
Elliott Hughes [Tue, 28 Apr 2015 18:12:50 +0000 (18:12 +0000)]
Merge "Build simpleperf in user-debug mode, and put it in /system/xbin/."

9 years agoMerge "Build perfprofd and its libraries in userdebug mode only, and store it in...
Elliott Hughes [Tue, 28 Apr 2015 00:03:54 +0000 (00:03 +0000)]
Merge "Build perfprofd and its libraries in userdebug mode only, and store it in /system/xbin/"

9 years agoBuild simpleperf in user-debug mode, and put it in /system/xbin/.
Dehao Chen [Mon, 27 Apr 2015 22:34:09 +0000 (15:34 -0700)]
Build simpleperf in user-debug mode, and put it in /system/xbin/.

Change-Id: I83cf2bece5491ab88cd8ceff7fdd8f563d50f18f

9 years agoBuild perfprofd and its libraries in userdebug mode only, and store it in /system...
Dehao Chen [Mon, 27 Apr 2015 22:25:39 +0000 (15:25 -0700)]
Build perfprofd and its libraries in userdebug mode only, and store it in /system/xbin/

Change-Id: I77c4176b75018aedc8a8d6e4633109367cc0b304

9 years agoMerge "Securely encrypt the master key"
Paul Lawrence [Mon, 27 Apr 2015 20:08:51 +0000 (20:08 +0000)]
Merge "Securely encrypt the master key"

9 years agoSecurely encrypt the master key
Paul Lawrence [Tue, 31 Mar 2015 18:18:31 +0000 (11:18 -0700)]
Securely encrypt the master key

Move functionality from init into vold so we can use
vold to manage key encryption

This is one of four changes to enable this functionality:
  https://android-review.googlesource.com/#/c/144586/
  https://android-review.googlesource.com/#/c/144663/
  https://android-review.googlesource.com/#/c/144672/
  https://android-review.googlesource.com/#/c/144673/

Bug: 18151196
Change-Id: I4a1c79d27f0d225a9ce4ac21653279919f75c991

9 years agoMerge "fix possible buffer overrun in librank"
Colin Cross [Fri, 24 Apr 2015 21:58:46 +0000 (21:58 +0000)]
Merge "fix possible buffer overrun in librank"

9 years agoMerge "Implement simpleperf stat subcommand."
Yabin Cui [Thu, 23 Apr 2015 23:01:30 +0000 (23:01 +0000)]
Merge "Implement simpleperf stat subcommand."

9 years agoImplement simpleperf stat subcommand.
Yabin Cui [Tue, 21 Apr 2015 01:07:17 +0000 (18:07 -0700)]
Implement simpleperf stat subcommand.

Also add some simple unit-tests.

Change-Id: Ic30a2d4a879e028a8c82babbaf82e322fc49a838

9 years agoMerge "Second round of changes to 'perf' profile collection daemon."
Than McIntosh [Thu, 23 Apr 2015 00:31:24 +0000 (00:31 +0000)]
Merge "Second round of changes to 'perf' profile collection daemon."

9 years agofix possible buffer overrun in librank
daegeun.song [Wed, 22 Apr 2015 02:31:29 +0000 (11:31 +0900)]
fix possible buffer overrun in librank

Use snprintf instead of sprintf and fclose() before return.

Change-Id: I2c367b2e7b943f4ed10551c18ecc971e6b830c66
Signed-off-by: Daegeun Song <daegeun.song@lge.com>
9 years agoSecond round of changes to 'perf' profile collection daemon.
Than McIntosh [Fri, 17 Apr 2015 19:10:43 +0000 (15:10 -0400)]
Second round of changes to 'perf' profile collection daemon.

Details:
- avoid use of system() in favor of fork/exec.
- add option to selectively disable/enable mpdecision service around perf
  collection runs to improve profile quality and avoid kernel pmuevents issues.
- default to using 'simpleperf' instead of 'perf'

Change-Id: I27928d8bb647fd852ec944158ebfd8efa38c01b4

9 years agoMerge "Do free and fclose when error occur."
Colin Cross [Wed, 22 Apr 2015 17:57:32 +0000 (17:57 +0000)]
Merge "Do free and fclose when error occur."

9 years agoDo free and fclose when error occur.
daegeun.song [Wed, 22 Apr 2015 05:14:02 +0000 (14:14 +0900)]
Do free and fclose when error occur.

Do free and fclose when error occur.

Change-Id: Ifc611579cf919eeb3fbbf1dff70e7f851a26e083
Signed-off-by: Daegeun Song <daegeun.song@lge.com>
9 years agoMerge "Implement simpleperf list subcommand."
Yabin Cui [Sat, 18 Apr 2015 21:13:26 +0000 (21:13 +0000)]
Merge "Implement simpleperf list subcommand."

9 years agoImplement simpleperf list subcommand.
Yabin Cui [Thu, 16 Apr 2015 22:26:31 +0000 (15:26 -0700)]
Implement simpleperf list subcommand.

simpleperf is used to replace linux/tools/perf. And This CL implements
the list subcommand of it.

Change-Id: I3e6fe854e19cc370070d0fd8416d0aa6fa8f8e90

9 years agoMerge "f2fs_utils: fix build break in static_sdk_tools"
Mark Salyzyn [Thu, 16 Apr 2015 18:02:41 +0000 (18:02 +0000)]
Merge "f2fs_utils: fix build break in static_sdk_tools"

9 years agof2fs_utils: fix build break in static_sdk_tools
Mark Salyzyn [Thu, 16 Apr 2015 16:56:36 +0000 (09:56 -0700)]
f2fs_utils: fix build break in static_sdk_tools

external/f2fs-tools/mkfs/f2fs_format.c:357:
    error: undefined reference to dev_read_version
clang: error:
    linker command failed with exit code 1 (use -v to see invocation)
make: *** [out/host/linux-x86/obj/lib/libf2fs_fmt_host_dyn.so] Error 1

Change-Id: I9bf1eec9ee60aa2fc55a3d0793a67d36f271acef

9 years agoMerge "make_ext4fs: use libcutils and libselinux shared libraries"
Mark Salyzyn [Wed, 15 Apr 2015 18:14:37 +0000 (18:14 +0000)]
Merge "make_ext4fs: use libcutils and libselinux shared libraries"

9 years agoMerge "Move away from gr_surface."
Elliott Hughes [Wed, 15 Apr 2015 17:59:52 +0000 (17:59 +0000)]
Merge "Move away from gr_surface."