OSDN Git Service
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
Lorenzo Colitti [Wed, 20 May 2015 09:48:13 +0000 (09:48 +0000)]
am
8fc9bc57: Merge "Disable certain kernel configuration options in net_test."
* commit '
8fc9bc570474c7f76638529e2b98248775c0d5d8':
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."
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
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>
Elliott Hughes [Sat, 16 May 2015 01:30:38 +0000 (01:30 +0000)]
am
1865679f: Don\'t use TEMP_FAILURE_RETRY with close in system/extras.
* commit '
1865679fda9bd1e12bc583268537bccc4e4a43bc':
Don't use TEMP_FAILURE_RETRY with close in system/extras.
Elliott Hughes [Sat, 16 May 2015 01:30:27 +0000 (01:30 +0000)]
am
76aa23ab: Merge "Don\'t use TEMP_FAILURE_RETRY with close in system/extras."
* commit '
76aa23abe61a6848963ebcb2a2ef6bfa3614b3d7':
Don'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
(cherry picked from commit
454b989922c7fb8e1411d06ee26ad7c4e6bc2abe)
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."
Yabin Cui [Sat, 16 May 2015 01:06:39 +0000 (01:06 +0000)]
am
507b7ee2: Merge "Support tracepoint event types in simpleperf."
* commit '
507b7ee264237c3668593e201e59d907cc452812':
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."
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
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
Jeff Vander Stoep [Thu, 14 May 2015 15:51:44 +0000 (15:51 +0000)]
am
36a3d0ed: Merge "Remove selinux/android.h from host tools"
* commit '
36a3d0edf07d74f9036ac1cad5a917d74e2a86ce':
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"
Yabin Cui [Thu, 14 May 2015 06:38:04 +0000 (06:38 +0000)]
am
c152bb49: Merge "Dump build_id feature in `simpleperf record`." into mnc-dev
* commit '
c152bb4981f9fdd47ad5bab582b27cc103134461':
Dump build_id feature in `simpleperf record`.
Yabin Cui [Thu, 14 May 2015 06:34:19 +0000 (23:34 -0700)]
resolved conflicts for merge of
9e569fa9 to mnc-dev-plus-aosp
Change-Id: I56af6296b0cc8aeaf9517f344f8038ace3085eb2
Yabin Cui [Thu, 14 May 2015 03:47:46 +0000 (20:47 -0700)]
resolved conflicts for merge of
11721639 to mnc-dev-plus-aosp
Change-Id: I141ab123d6dc704240c2722dae7142a97ac99d71
Yabin Cui [Thu, 14 May 2015 02:22:42 +0000 (02:22 +0000)]
Merge "Dump build_id feature in `simpleperf record`." into mnc-dev
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
(cherry picked from commit
8f6225147c5b6cb2159a7f5cb0dab952ee0759df)
Yabin Cui [Thu, 14 May 2015 02:15:48 +0000 (02:15 +0000)]
Merge "Dump kernel/modules/thread mmap information in `simpleperf record`." into mnc-dev
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
(cherry picked from commit
7d59bb49fb47fbc82ef5c77d7aebf7174fd996e1)
Yabin Cui [Thu, 14 May 2015 02:10:22 +0000 (02:10 +0000)]
Merge "Implement simpleperf record/dumprecord subcommands." into mnc-dev
Dehao Chen [Thu, 14 May 2015 01:56:08 +0000 (01:56 +0000)]
am
5c41562e: Add sequence number to encoded perf.data file.
* commit '
5c41562e1217c0f2b7693a3e29ec4b0826542a39':
Add sequence number to encoded perf.data file.
Yabin Cui [Tue, 28 Apr 2015 22:54:13 +0000 (15:54 -0700)]
Implement simpleperf record/dumprecord subcommands.
(cherry picked from commit
9759e1b1ce76185aa539aeea2fb1cbd8382156e7)
Bug:
19483574
Change-Id: Id879713a75c2d3a6289d8847b95ee0bb4a2cc8a0
Dehao Chen [Thu, 7 May 2015 20:16:35 +0000 (13:16 -0700)]
Add sequence number to encoded perf.data file.
Bug:
19483574
(cherry picked from commit
f4605017b29dd98232af9385e71079a3ba0297f1)
Change-Id: I0ca00ce1a4695f2543da3a24987e9cbbeb22cc09
Elliott Hughes [Thu, 14 May 2015 00:53:17 +0000 (00:53 +0000)]
am
3bf60ccd: Merge "Add sequence number to encoded perf.data file."
* commit '
3bf60ccddd49d06e39a840a0f3c4506dedffaa59':
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."
Yabin Cui [Thu, 14 May 2015 00:00:22 +0000 (00:00 +0000)]
am
c49491f2: Merge "Dump build_id feature in `simpleperf record`."
* commit '
c49491f2f0cc3e5d3e4c57bd755226c3b93490a0':
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`."
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
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
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
Adam Langley [Wed, 13 May 2015 19:28:42 +0000 (19:28 +0000)]
am
f2392997: system/extra: include more of what you use.
* commit '
f2392997221777282197127c5febf65d8cc699ea':
system/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.
(cherry picked from commit
a83adf6354f3073a1938ffcd6cadd5c357856de5)
Bug:
21085331
Change-Id: I9e4c9e4d459c2e31f74180b3a3b2ab139ab76e80
Elliott Hughes [Wed, 13 May 2015 17:26:24 +0000 (17:26 +0000)]
am
f044a21a: Merge "Fix unused result warnings in system/extras/verity."
* commit '
f044a21af13472bed9d74b96829a0e5597af0a7a':
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."
Lorenzo Colitti [Wed, 13 May 2015 16:40:43 +0000 (16:40 +0000)]
am
bd76641b: Merge "Improve netlink message debugging."
* commit '
bd76641bc52d33081d8d09be98e42694f952258c':
Improve netlink message debugging.
Kenny Root [Wed, 13 May 2015 16:32:09 +0000 (16:32 +0000)]
am
d30f68d1: Merge "system/extra: include more of what you use."
* commit '
d30f68d1d436f2669084315324bc1f64a581b3aa':
system/extra: include more of what you use.
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
Paul Crowley [Wed, 13 May 2015 15:21:42 +0000 (15:21 +0000)]
am
e66a8722: Merge "Don\'t apply default encryption to /data/user, it should get per-user encryption."
* commit '
e66a872232f484e8ec442d6e5a6f20122d269698':
Don't apply default encryption to /data/user, it should get per-user encryption.
Lorenzo Colitti [Wed, 13 May 2015 08:46:08 +0000 (08:46 +0000)]
Merge "Improve 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
Kenny Root [Tue, 12 May 2015 22:41:13 +0000 (22:41 +0000)]
Merge "system/extra: include more of what you use."
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."
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
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
Kenny Root [Sun, 10 May 2015 00:13:21 +0000 (00:13 +0000)]
am
3d59e00f: Merge "Revert "system/extra: include more of what you use.""
* commit '
3d59e00f74fa6b866aba09628416555ce06f2bfe':
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.""
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
Kenny Root [Sat, 9 May 2015 15:15:57 +0000 (15:15 +0000)]
am
18b671d7: Merge "system/extra: include more of what you use."
* commit '
18b671d7d3375be639118aa74dd6a88955bf8779':
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."
Lorenzo Colitti [Fri, 8 May 2015 09:35:28 +0000 (09:35 +0000)]
am
588f361f: Merge "Support dumping neighbour cache entries."
* commit '
588f361f5ad9afb01d6b4e821a9123ca9b57d14f':
Support dumping neighbour cache entries.
Lorenzo Colitti [Fri, 8 May 2015 08:45:36 +0000 (08:45 +0000)]
Merge "Support 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
Dehao Chen [Thu, 7 May 2015 17:43:31 +0000 (17:43 +0000)]
am
768b73e1: Separate the destination directory to /data/misc/perfprofd. Remove reading of aux-config.
* commit '
768b73e1500d7db318bed1c3fb326d84f9fe150e':
Separate the destination directory to /data/misc/perfprofd. Remove reading of aux-config.
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
(cherry picked from commit
58bade36c738ed96137cfcc8d15f0505f085b5ae)
Change-Id: I019540197561d13d99640a8ff7042c20b58d9b9f
Elliott Hughes [Thu, 7 May 2015 16:16:01 +0000 (16:16 +0000)]
am
bd263306: Merge "Separate the destination directory to /data/misc/perfprofd. Remove reading of aux-config."
* commit '
bd263306925062204914e07c827028c356bfbf11':
Separate the destination directory to /data/misc/perfprofd. Remove reading of aux-config.
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."
Yabin Cui [Wed, 6 May 2015 22:55:44 +0000 (22:55 +0000)]
am
884fc856: Merge "Dump kernel/modules/thread mmap information in `simpleperf record`."
* commit '
884fc856c79eddf8ac68fd54d75d804116f577e5':
Dump kernel/modules/thread mmap information in `simpleperf record`.
Paul Lawrence [Wed, 6 May 2015 22:45:30 +0000 (22:45 +0000)]
am
9c9d46d7: Merge changes I15dc0de9,Icdb3d9af
* commit '
9c9d46d799dce70b22573bdee23eb9a80e733517':
Use default key permissions for ext4enc
New faster file open kernel
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
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
Yabin Cui [Tue, 5 May 2015 22:21:11 +0000 (22:21 +0000)]
Merge "Dump 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
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