OSDN Git Service
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
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
Dehao Chen [Tue, 5 May 2015 19:00:36 +0000 (19:00 +0000)]
am
81e5cd75: Change the encoded file\'s mode to be readable by GMS core.
* commit '
81e5cd7581d040316527d0ae4ffd695dd0d017b7':
Change the encoded file's mode to be readable by GMS core.
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
Paul Lawrence [Fri, 1 May 2015 12:24:04 +0000 (05:24 -0700)]
New faster file open kernel
Bug:
18151196
Change-Id: Icdb3d9afa1db125102d01cd06f45dbc99ca78021
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
(cherry picked from commit
adc45b2517a336e152aaa8ffbf19a505547f7d77)
Change-Id: I0ec40f7571d9b400bc37f2ebe7a268d1cb8dfe82
Elliott Hughes [Tue, 5 May 2015 01:17:34 +0000 (01:17 +0000)]
am
2adbe38f: Merge "Change the encoded file\'s mode to be readable by GMS core."
* commit '
2adbe38fada256e0fae039c3a6e869441266597e':
Change the encoded file's mode to be readable by GMS core.
Yabin Cui [Tue, 5 May 2015 01:17:34 +0000 (01:17 +0000)]
am
1352b82d: Merge "Implement simpleperf record/dumprecord subcommands."
* commit '
1352b82d4aed6b5dd64cffaa2aefec0cfd45aeaa':
Implement simpleperf record/dumprecord subcommands.
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."
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
Yabin Cui [Mon, 4 May 2015 22:47:15 +0000 (22:47 +0000)]
Merge "Implement 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
Colin Cross [Sun, 3 May 2015 21:39:51 +0000 (21:39 +0000)]
am
8bad7433: Merge "Fix asan error when copying super block to backup super blocks"
* commit '
8bad7433bd6f5f30a51e837852bd00f859ec730e':
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"
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
Paul Lawrence [Fri, 1 May 2015 15:00:17 +0000 (15:00 +0000)]
am
0ae45f5b: Merge "Enable properties in ext4enc"
* commit '
0ae45f5bc3152c7643d4d7a9f0cb7f9803f99e81':
Enable properties in ext4enc
Paul Lawrence [Fri, 1 May 2015 14:44:42 +0000 (14:44 +0000)]
Merge "Enable properties in ext4enc"
Dehao Chen [Thu, 30 Apr 2015 18:34:57 +0000 (18:34 +0000)]
am
456e3711: Update simpleperf path to /system/xbin/simpleperf.
* commit '
456e3711e71fa2c11cae654b758c6d10124dfce8':
Update simpleperf path to /system/xbin/simpleperf.
Elliott Hughes [Thu, 30 Apr 2015 18:26:09 +0000 (18:26 +0000)]
am
00c98046: Merge "Update simpleperf path to /system/xbin/simpleperf."
* commit '
00c9804619dbfa52581b60bb054a067cfc022768':
Update 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
(cherry picked from commit
35bb6be739761482fa7e72214d2aedf2623cbb9a)
Elliott Hughes [Thu, 30 Apr 2015 17:56:52 +0000 (17:56 +0000)]
Merge "Update 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
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
Paul Lawrence [Thu, 30 Apr 2015 16:52:34 +0000 (16:52 +0000)]
am
3a693f65: Merge "New ext4enc kernel switching from xattrs to ioctl"
* commit '
3a693f65e88d459c4b817628f6faaa191cc51db0':
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"
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
Than McIntosh [Thu, 30 Apr 2015 01:15:10 +0000 (01:15 +0000)]
am
904c3e49: Switch perfprofd from using full to lite version of protobuf library.
* commit '
904c3e49bb43ee9f7dbde66e266f0e02f5193efd':
Switch perfprofd from using full to lite version of protobuf library.
Elliott Hughes [Thu, 30 Apr 2015 01:14:37 +0000 (01:14 +0000)]
am
ca1a9df2: Merge "Switch perfprofd from using full to lite version of protobuf library."
* commit '
ca1a9df2b8a195342e3a17f2a92b4cd2c650e0c0':
Switch 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
(cherry picked from commit
124dd4262f2a2c8e55fdb81af9981b1f949a9686)
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."
Dehao Chen [Wed, 29 Apr 2015 22:40:37 +0000 (22:40 +0000)]
am
f926fc2c: Default the config file to NULL for perfprofd, so that we will not see error in logcat when config file is not specified.
* commit '
f926fc2ce2e052dd42591cc0c5ce4e1620a765f8':
Default the config file to NULL for perfprofd, so that we will not see error in logcat when config file is not specified.
Dehao Chen [Wed, 29 Apr 2015 22:40:37 +0000 (22:40 +0000)]
am
7dfd2e74: Build simpleperf in user-debug mode, and put it in /system/xbin/.
* commit '
7dfd2e74687d43bbd4a8987eec8a307554e7af9f':
Build simpleperf in user-debug mode, and put it in /system/xbin/.
Elliott Hughes [Wed, 29 Apr 2015 22:26:47 +0000 (22:26 +0000)]
am
8ffdf93b: Merge "Default the config file to NULL for perfprofd, so that we will not see error in logcat when config file is not specified."
* commit '
8ffdf93bdf10eea877945fc92a4117935c70f5eb':
Default the config file to NULL for perfprofd, so that we will not see error in logcat when config file is not specified.
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
(cherry picked from commit
bfd3af43e88249e763185005cf1db3cca4a3e6ed)
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."
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
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
Paul Lawrence [Wed, 29 Apr 2015 17:00:52 +0000 (17:00 +0000)]
am
efd93b16: Merge "Securely encrypt the master key"
* commit '
efd93b16b36d2aecc994c282317f37729bab7357':
Securely encrypt the master key
Paul Lawrence [Wed, 29 Apr 2015 16:24:25 +0000 (16:24 +0000)]
Merge "Securely encrypt the master key"
Colin Cross [Wed, 29 Apr 2015 01:08:31 +0000 (01:08 +0000)]
am
cf461bce: Merge "make_ext4fs: write out super blocks at last for block devices"
* commit '
cf461bced1ef97331e808ab0fb994a6ada93f2eb':
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"
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>
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
Colin Cross [Tue, 28 Apr 2015 22:30:31 +0000 (22:30 +0000)]
am
249518de: Merge "Add real UUID support to ext4_utils."
* commit '
249518de7cb7ddb1c066b3bb8b10bc0f66222f7d':
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."
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
Paul Lawrence [Tue, 28 Apr 2015 21:33:30 +0000 (21:33 +0000)]
am
b0d18728: Merge "Revert "Securely encrypt the master key""
* commit '
b0d1872803e2527a501d74b7afa518148414f1fb':
Revert "Securely encrypt the master key"
Elliott Hughes [Tue, 28 Apr 2015 21:10:15 +0000 (21:10 +0000)]
am
21e720a8: Merge "Build simpleperf in user-debug mode, and put it in /system/xbin/."
* commit '
21e720a8bde20f6255d51f9183ba90f01457fdd3':
Build simpleperf in user-debug mode, and put it in /system/xbin/.
Paul Lawrence [Tue, 28 Apr 2015 19:16:07 +0000 (19:16 +0000)]
Merge "Revert "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
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/.
(cherry picked from commit
d455de47298ada7e3532104a8e3312822a940906)
Change-Id: I53aa95e0c34957262bc9ebf3c2dff40bfee6867e
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/."
Dehao Chen [Tue, 28 Apr 2015 14:53:36 +0000 (14:53 +0000)]
am
17958658: Build perfprofd and its libraries in userdebug mode only, and store it in /system/xbin/
* commit '
1795865852cd338f271b90011438b1ff2d5e1541':
Build perfprofd and its libraries in userdebug mode only, and store it in /system/xbin/
Elliott Hughes [Tue, 28 Apr 2015 00:24:20 +0000 (00:24 +0000)]
am
6eec6599: Merge "Build perfprofd and its libraries in userdebug mode only, and store it in /system/xbin/"
* commit '
6eec6599a80838a00322da2f281a379a67fdbaee':
Build perfprofd and its libraries in userdebug mode only, and store it in /system/xbin/
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/
(cherry picked from commit
2a1e7e814c9cb300c22132763a1817c04907e75b)
Change-Id: Ie893f20cd8b103d5eabdc57a13a6c6d9cf35d27d
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/"
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
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
Paul Lawrence [Mon, 27 Apr 2015 21:48:52 +0000 (21:48 +0000)]
am
e73da0cd: Merge "Securely encrypt the master key"
* commit '
e73da0cdaa154b5cd0c2f10cb2d1f9b9dd171900':
Securely encrypt the master key
Paul Lawrence [Mon, 27 Apr 2015 20:08:51 +0000 (20:08 +0000)]
Merge "Securely 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
Colin Cross [Fri, 24 Apr 2015 22:42:36 +0000 (22:42 +0000)]
am
7117efce: Merge "fix possible buffer overrun in librank"
* commit '
7117efced82fcb4d3658161d765bfc964ab930f4':
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"
Yabin Cui [Thu, 23 Apr 2015 23:44:29 +0000 (23:44 +0000)]
am
ffc011b6: Merge "Implement simpleperf stat subcommand."
* commit '
ffc011b651535c46225630f5b73a798d86c1f52e':
Implement simpleperf stat subcommand.
Yabin Cui [Thu, 23 Apr 2015 23:01:30 +0000 (23:01 +0000)]
Merge "Implement 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