OSDN Git Service
Yusuke Sato [Wed, 19 Aug 2015 22:20:30 +0000 (22:20 +0000)]
am
25d34e2a: Merge "Use the new version of android_fork_execvp_ext()"
* commit '
25d34e2af21e7a34f01eef25df94be73995cb7fc':
Use the new version of android_fork_execvp_ext()
Yusuke Sato [Wed, 19 Aug 2015 20:23:43 +0000 (20:23 +0000)]
Merge "Use the new version of android_fork_execvp_ext()"
Yusuke Sato [Tue, 18 Aug 2015 19:10:45 +0000 (12:10 -0700)]
Use the new version of android_fork_execvp_ext()
This CL depends on I818f5cf61045286c8d64a91b6d50f05740329be1.
Bug:
21725996
Change-Id: I2d26cf79989de717b7695757d0297a16dedbebbd
Yabin Cui [Wed, 19 Aug 2015 02:59:22 +0000 (02:59 +0000)]
am
3c599ffc: Merge "Simpleperf: demangle symbols only when necessary."
* commit '
3c599ffc9954dd25f0f3ad012189f825afd89449':
Simpleperf: demangle symbols only when necessary.
Yabin Cui [Wed, 19 Aug 2015 02:47:33 +0000 (02:47 +0000)]
Merge "Simpleperf: demangle symbols only when necessary."
Yabin Cui [Tue, 18 Aug 2015 23:32:18 +0000 (16:32 -0700)]
Simpleperf: demangle symbols only when necessary.
Before this change:
$sudo simpleperf record -a sleep 1
$sudo simpleperf stat simpleperf report
Total test time: 4.088779 seconds.
After this change:
$sudo simpleperf record -a sleep 1
$sudo simpleperf stat simpleperf report
Total test time: 1.226267 seconds.
Change-Id: Ifc811f432ac69f770eeb5814e4983f6f19dbc909
Riley Andrews [Tue, 18 Aug 2015 19:32:11 +0000 (19:32 +0000)]
am
2c0f9f26: Merge "Add memcpy perf test + graphing script."
* commit '
2c0f9f263cd6c3857850c7d3a8f2aabb63ce48be':
Add memcpy perf test + graphing script.
Riley Andrews [Tue, 18 Aug 2015 19:17:30 +0000 (19:17 +0000)]
Merge "Add memcpy perf test + graphing script."
Riley Andrews [Mon, 17 Aug 2015 23:42:26 +0000 (16:42 -0700)]
Add memcpy perf test + graphing script.
Change-Id: Iaaac90f4d91dbe6023b64af6e8924f6b9f61e58b
Andreas Gampe [Thu, 6 Aug 2015 00:16:22 +0000 (17:16 -0700)]
Ext4utils: Fix unused parameters
Refactor code so that parameters are not unused and the debug code
is always at least checked (and in non-debug cases compiled away).
Bug:
18632512
(cherry picked from commit
7ec740fee7356dd72918c9b9fd0a91276356673b)
Change-Id: I0e1eedae97a6edceb1771e10e6ec82c641ba9c5e
Dan Albert [Wed, 12 Aug 2015 02:05:40 +0000 (02:05 +0000)]
am
89a2254a: Merge "Add missing include."
* commit '
89a2254abae3f427aa85fb3a3afe9a27cdfad68d':
Add missing include.
Dan Albert [Wed, 12 Aug 2015 01:49:40 +0000 (01:49 +0000)]
Merge "Add missing include."
Dan Albert [Wed, 12 Aug 2015 01:36:20 +0000 (18:36 -0700)]
Add missing include.
Used to be transitively included by libc++.
Change-Id: I07497ccc9bbcf3370b065876d91aed760c5f6118
Dan Albert [Tue, 11 Aug 2015 23:30:27 +0000 (23:30 +0000)]
am
587fc682: Merge "Add missing includes for pid_t."
* commit '
587fc682ec1e81c400cd61f742bf8a0a26343425':
Add missing includes for pid_t.
Dan Albert [Tue, 11 Aug 2015 23:11:03 +0000 (23:11 +0000)]
Merge "Add missing includes for pid_t."
Dan Albert [Tue, 11 Aug 2015 22:59:43 +0000 (15:59 -0700)]
Add missing includes for pid_t.
Was being transitively included through libc++, but the libc++ update
fixes some of the leaky headers (used to always include unistd.h!).
Change-Id: I40caf74695bb75901bda24665b8d83a6914de9c4
Elliott Hughes [Mon, 10 Aug 2015 23:04:54 +0000 (23:04 +0000)]
am
31d0d7cb: Merge "Add <endian.h> back and stop building one tool for the Mac."
* commit '
31d0d7cbc1f4ed6a9295dd326104b8071478f924':
Add <endian.h> back and stop building one tool for the Mac.
Elliott Hughes [Mon, 10 Aug 2015 22:53:27 +0000 (22:53 +0000)]
Merge "Add <endian.h> back and stop building one tool for the Mac."
Elliott Hughes [Mon, 10 Aug 2015 22:49:04 +0000 (15:49 -0700)]
Add <endian.h> back and stop building one tool for the Mac.
We can't stop building all this stuff until we clean up the build
system to not require the OTA tools on Mac OS. This code does actually
use htobe64 and so should have included <endian.h>, so put that back.
Change-Id: I2807b4f237d3e26d470652f373f2de85864691c4
Elliott Hughes [Mon, 10 Aug 2015 22:22:47 +0000 (22:22 +0000)]
am
4361173d: Merge "Another go at fixing the Mac build."
* commit '
4361173d8b9d348e9566f754044db3fedfdf47eb':
Another go at fixing the Mac build.
Elliott Hughes [Mon, 10 Aug 2015 21:52:31 +0000 (21:52 +0000)]
Merge "Another go at fixing the Mac build."
Elliott Hughes [Mon, 10 Aug 2015 21:51:20 +0000 (14:51 -0700)]
Another go at fixing the Mac build.
I don't want to have to work out how to disable building OTAs on Macs --
though we should -- but it actually looks like this file didn't need the
problematic header file anyway.
Change-Id: I9d7eff8e72192958b3e880ae48fef194820ce148
Elliott Hughes [Mon, 10 Aug 2015 20:01:59 +0000 (13:01 -0700)]
resolved conflicts for merge of
b699685e to mnc-dr-dev-plus-aosp
Change-Id: I4d517d1e17fc512730e9d9d61562cb6407a8729a
Elliott Hughes [Mon, 10 Aug 2015 17:54:35 +0000 (17:54 +0000)]
Merge "Fix Mac build."
Elliott Hughes [Mon, 10 Aug 2015 17:43:57 +0000 (10:43 -0700)]
Fix Mac build.
Change-Id: I4d389d7050970d8fd460a4238e8c2963211780b4
Yabin Cui [Fri, 7 Aug 2015 23:28:54 +0000 (23:28 +0000)]
am
c19b2933: Merge "Simpleperf: add filters to report command."
* commit '
c19b2933408bad3ae45de3817719943d1465af69':
Simpleperf: add filters to report command.
Yabin Cui [Fri, 7 Aug 2015 23:15:42 +0000 (23:15 +0000)]
Merge "Simpleperf: add filters to report command."
Yabin Cui [Thu, 6 Aug 2015 18:25:09 +0000 (11:25 -0700)]
Simpleperf: add filters to report command.
Change-Id: I0e6cec1ce638fd4c832fe398a08168138e22ee7e
Yabin Cui [Fri, 7 Aug 2015 21:12:58 +0000 (21:12 +0000)]
am
a5732f78: Merge "Simpleperf: support caller callgraph."
* commit '
a5732f780a1485ac1d8f9855bc2a0b56714afe42':
Simpleperf: support caller callgraph.
Yabin Cui [Fri, 7 Aug 2015 16:12:18 +0000 (16:12 +0000)]
Merge "Simpleperf: support caller callgraph."
Yabin Cui [Thu, 6 Aug 2015 17:35:30 +0000 (17:35 +0000)]
am
32ee7cc0: Merge "Simpleperf: don\'t check for empty build id."
* commit '
32ee7cc00b4136765764266446600aaf2184b246':
Simpleperf: don't check for empty build id.
Yabin Cui [Thu, 6 Aug 2015 17:22:21 +0000 (17:22 +0000)]
Merge "Simpleperf: don't check for empty build id."
Yabin Cui [Tue, 4 Aug 2015 21:48:39 +0000 (14:48 -0700)]
Simpleperf: don't check for empty build id.
Change-Id: I670ba4fa32aa764e49022abacd83ef1fdcfa7d0d
Yabin Cui [Wed, 5 Aug 2015 00:33:47 +0000 (17:33 -0700)]
Simpleperf: support caller callgraph.
Bug:
22229391
Change-Id: I95af71d50811feb4515a5c4ec7102788a00aad31
Yabin Cui [Mon, 3 Aug 2015 21:47:15 +0000 (21:47 +0000)]
am
ec53f3cc: Merge "Simpleperf: fix the process of parsing records."
* commit '
ec53f3ccc3db9461d0b3295f8353ed37b99d4211':
Simpleperf: fix the process of parsing records.
Yabin Cui [Mon, 3 Aug 2015 21:46:50 +0000 (21:46 +0000)]
am
224d3ba8: Merge "Simpleperf: correct the event type name printed in stat command."
* commit '
224d3ba8d5a0c2438b6be1b5f6ae6c01747343a5':
Simpleperf: correct the event type name printed in stat command.
Yabin Cui [Mon, 3 Aug 2015 20:46:43 +0000 (20:46 +0000)]
Merge "Simpleperf: fix the process of parsing records."
Yabin Cui [Mon, 3 Aug 2015 18:07:12 +0000 (18:07 +0000)]
Merge "Simpleperf: correct the event type name printed in stat command."
Yabin Cui [Mon, 3 Aug 2015 18:01:22 +0000 (11:01 -0700)]
Simpleperf: fix the process of parsing records.
It is not correct to parse all the mmap records first, then parse
all the sample records. Instead, records should be parsed one by one.
This change also fix the bug of not writing kernel build id in
record command, which is introduced previously.
Change-Id: I7e6d3d1c74c134e4b7af97c184b6a71c3379a59a
Elliott Hughes [Sat, 1 Aug 2015 15:47:58 +0000 (15:47 +0000)]
am
9c6eab9a: Merge "Use __ANDROID__ instead of HAVE_ANDROID_OS."
* commit '
9c6eab9a5bb7c979488dcfe7ea71a039e6a369fb':
Use __ANDROID__ instead of HAVE_ANDROID_OS.
Yabin Cui [Sat, 1 Aug 2015 01:40:09 +0000 (18:40 -0700)]
Simpleperf: correct the event type name printed in stat command.
Bug:
22884977
Change-Id: I3c4f5c8dc02d5b17f5942e4e98476d1c4f3fbcad
Elliott Hughes [Fri, 31 Jul 2015 17:54:17 +0000 (17:54 +0000)]
Merge "Use __ANDROID__ instead of HAVE_ANDROID_OS."
Elliott Hughes [Fri, 31 Jul 2015 15:49:29 +0000 (08:49 -0700)]
Use __ANDROID__ instead of HAVE_ANDROID_OS.
Change-Id: Iee986b6c91b5877155609297c2bd17301ff91d5c
Erik Kline [Thu, 30 Jul 2015 04:32:38 +0000 (04:32 +0000)]
am
504462b2: Merge "Tests for candidate source address restriction"
* commit '
504462b2a2a4ed1ab4436ac5344d6550f808bb1e':
Tests for candidate source address restriction
Erik Kline [Thu, 30 Jul 2015 04:04:53 +0000 (04:04 +0000)]
Merge "Tests for candidate source address restriction"
Erik Kline [Thu, 2 Jul 2015 07:08:15 +0000 (16:08 +0900)]
Tests for candidate source address restriction
Bug:
20733156
Change-Id: I4118cc4c4dc8e9730bc95e681c14c29240f1af77
Simon Wilson [Wed, 29 Jul 2015 22:19:23 +0000 (15:19 -0700)]
resolved conflicts for merge of
743e4b08 to mnc-dr-dev-plus-aosp
Change-Id: I8a4408dc72545739e60da0a52f08c44b35f52ee0
Simon Wilson [Wed, 29 Jul 2015 21:36:06 +0000 (21:36 +0000)]
Merge "Add switches for compressor"
Lorenzo Colitti [Tue, 28 Jul 2015 14:55:32 +0000 (14:55 +0000)]
am
07d188ad: Merge "Fix lint errors."
* commit '
07d188ade6594546446f235ff60dd44859cc591e':
Fix lint errors.
Lorenzo Colitti [Tue, 28 Jul 2015 14:31:48 +0000 (14:31 +0000)]
Merge "Fix lint errors."
Yabin Cui [Fri, 24 Jul 2015 18:41:14 +0000 (18:41 +0000)]
am
ae5cab41: Merge "Simpleperf: work around unexpected (pid, tid) pair."
* commit '
ae5cab410f747ac18a8ef0341322d997c44dfb7d':
Simpleperf: work around unexpected (pid, tid) pair.
Yabin Cui [Fri, 24 Jul 2015 18:19:45 +0000 (18:19 +0000)]
am
5c9978ce: Merge "Simpleperf: use ThreadTree when getting hit files in record command."
* commit '
5c9978ceeaeac2442c0ca4722111551ecbe6d144':
Simpleperf: use ThreadTree when getting hit files in record command.
Yabin Cui [Fri, 24 Jul 2015 18:15:52 +0000 (18:15 +0000)]
Merge "Simpleperf: work around unexpected (pid, tid) pair."
Yabin Cui [Fri, 24 Jul 2015 18:00:44 +0000 (11:00 -0700)]
Simpleperf: work around unexpected (pid, tid) pair.
Bug:
22185053
Change-Id: Ibd224ce9918eac9fa5a71ec00835b3af2b03e578
Yabin Cui [Fri, 24 Jul 2015 17:50:33 +0000 (17:50 +0000)]
Merge "Simpleperf: use ThreadTree when getting hit files in record command."
Yabin Cui [Fri, 24 Jul 2015 04:39:57 +0000 (21:39 -0700)]
Simpleperf: use ThreadTree when getting hit files in record command.
The new method is more accurate and has lower time complexity.
Bug:
22229391
Change-Id: I8b3016798b8a0e20335adeb7ec5dda0068044142
Yabin Cui [Fri, 24 Jul 2015 01:17:07 +0000 (01:17 +0000)]
am
47efd844: Merge "Simpleperf: separate ThreadTree from SampleTree."
* commit '
47efd84444cec06d79e2f53e4b2bb9a075b40e02':
Simpleperf: separate ThreadTree from SampleTree.
Yabin Cui [Fri, 24 Jul 2015 00:45:54 +0000 (00:45 +0000)]
Merge "Simpleperf: separate ThreadTree from SampleTree."
Yabin Cui [Thu, 23 Jul 2015 03:30:43 +0000 (20:30 -0700)]
Simpleperf: separate ThreadTree from SampleTree.
It is a preparation for unwinding in record command.
Bug:
22229391
Change-Id: I2f5c6df3f7332d4c98b61c7f9f922456b5bbeaaa
Yabin Cui [Tue, 21 Jul 2015 20:18:16 +0000 (20:18 +0000)]
am
defcf4e2: Merge "Simpleperf: load symbols from dso file only when necessary."
* commit '
defcf4e29e72c704e6aa19af8a88ab6e06735347':
Simpleperf: load symbols from dso file only when necessary.
Yabin Cui [Tue, 21 Jul 2015 19:18:57 +0000 (19:18 +0000)]
Merge "Simpleperf: load symbols from dso file only when necessary."
Yabin Cui [Tue, 21 Jul 2015 18:24:48 +0000 (11:24 -0700)]
Simpleperf: load symbols from dso file only when necessary.
Bug:
22630113
Change-Id: I12bb24ec02ba3ddb94bcb2a26ae2d6e7b445ed4d
Yabin Cui [Thu, 16 Jul 2015 20:55:16 +0000 (20:55 +0000)]
am
dece0f92: Merge "Simpleperf: dump thread comm/mmaps for selected threads."
* commit '
dece0f92f30bb6dbfd988907cda2bab15be2d732':
Simpleperf: dump thread comm/mmaps for selected threads.
Yabin Cui [Thu, 16 Jul 2015 20:26:35 +0000 (20:26 +0000)]
Merge "Simpleperf: dump thread comm/mmaps for selected threads."
Yabin Cui [Thu, 16 Jul 2015 17:20:55 +0000 (10:20 -0700)]
Simpleperf: dump thread comm/mmaps for selected threads.
Bug:
22511834
Change-Id: I2775b3a4cd393d75d5c6ebcd8a46e366ceb4ff76
Paul Lawrence [Thu, 16 Jul 2015 16:26:11 +0000 (16:26 +0000)]
am
9f441da9: am
dd22cb33: Actually encrypt stuff
* commit '
9f441da9d91298055cf9fd9ea7b4643aea33dd44':
Actually encrypt stuff
Paul Lawrence [Thu, 16 Jul 2015 15:59:01 +0000 (15:59 +0000)]
am
dd22cb33: Actually encrypt stuff
* commit '
dd22cb338ad59a4766e9ee47936f1e10b386e128':
Actually encrypt stuff
Paul Lawrence [Thu, 16 Jul 2015 14:54:52 +0000 (07:54 -0700)]
Actually encrypt stuff
Fix really dumb error in checkin
https://googleplex-android-review.git.corp.google.com/#/c/728542
This did the opposite of what I want
Bug:
22502319
Change-Id: I502c9b62d127e6221bbc5ff1a209cb0312ec943f
Paul Lawrence [Wed, 15 Jul 2015 23:48:22 +0000 (23:48 +0000)]
am
a0a0ebc5: am
65df483a: Don\'t encrypt lost+found
* commit '
a0a0ebc5bb1a009ecb4faac529fa2252568eda33':
Don't encrypt lost+found
Paul Lawrence [Wed, 15 Jul 2015 23:13:24 +0000 (23:13 +0000)]
am
65df483a: Don\'t encrypt lost+found
* commit '
65df483af2efcb2ab9fd82ae53f9aeaa55f0cebd':
Don't encrypt lost+found
Paul Lawrence [Wed, 15 Jul 2015 22:22:03 +0000 (15:22 -0700)]
Don't encrypt lost+found
ext4 encryption doesn't like it, and the kernel crashes.
Also fix a formatting error in logs.
Bug:
22478103
Change-Id: Ia25f4b0c1c9eeb20e39b795c7827c5bd1a11cb6a
Yabin Cui [Tue, 14 Jul 2015 20:27:29 +0000 (20:27 +0000)]
am
a209544b: Merge "Simpleperf: fix build on mac."
* commit '
a209544b63ca766af379337bd97ca19091f631c2':
Simpleperf: fix build on mac.
Yabin Cui [Tue, 14 Jul 2015 20:27:21 +0000 (20:27 +0000)]
am
98f391f3: Merge "Simpleperf: support --vmlinux option in report command."
* commit '
98f391f386b0b5e7bc57f77295e8edf848f5ff85':
Simpleperf: support --vmlinux option in report command.
Yabin Cui [Tue, 14 Jul 2015 20:27:20 +0000 (20:27 +0000)]
am
3fd76bc7: Merge "Simpleperf: fix build error on mips."
* commit '
3fd76bc71cef9dc49ec1b24bb0e2296f1d999e28':
Simpleperf: fix build error on mips.
Yabin Cui [Tue, 14 Jul 2015 20:27:15 +0000 (20:27 +0000)]
am
f1732eed: Merge "Simpleperf: Support dwarf callgraph recording."
* commit '
f1732eeda661c221ce52a1d9506e9e52db8bf377':
Simpleperf: Support dwarf callgraph recording.
Tao Bao [Tue, 14 Jul 2015 20:26:52 +0000 (20:26 +0000)]
am
dfff022d: Merge "ext4_utils: Wrap wipe.h to be C++ compatible."
* commit '
dfff022dd84587666909c518123b55a7f73accca':
ext4_utils: Wrap wipe.h to be C++ compatible.
Yabin Cui [Tue, 14 Jul 2015 17:14:18 +0000 (17:14 +0000)]
am
5e191823: am
96f2bc51: am
e7da7e9b: Simpleperf: remove abort in child process.
* commit '
5e191823c9d2e9e3309e24d63bc8d8058da3f9f7':
Simpleperf: remove abort in child process.
Yabin Cui [Tue, 14 Jul 2015 04:43:54 +0000 (04:43 +0000)]
Merge "Simpleperf: fix build on mac."
Yabin Cui [Tue, 14 Jul 2015 04:41:05 +0000 (21:41 -0700)]
Simpleperf: fix build on mac.
Change-Id: I042fa65347c38879ff9b9f1027b8ae39ec26da62
Yabin Cui [Tue, 14 Jul 2015 02:48:30 +0000 (02:48 +0000)]
Merge "Simpleperf: support --vmlinux option in report command."
Yabin Cui [Tue, 14 Jul 2015 02:47:40 +0000 (02:47 +0000)]
Merge "Simpleperf: fix build error on mips."
Yabin Cui [Tue, 14 Jul 2015 02:44:24 +0000 (19:44 -0700)]
Simpleperf: fix build error on mips.
Bug:
22229391
Change-Id: I3368da136277355e05045ee1203bb9a47036e94a
Yabin Cui [Mon, 13 Jul 2015 23:23:13 +0000 (16:23 -0700)]
Simpleperf: support --vmlinux option in report command.
Bug:
22179177
Change-Id: I633da55c6bfcb106d69de9bda6b44bce24ffca8e
Yabin Cui [Tue, 14 Jul 2015 02:08:23 +0000 (02:08 +0000)]
Merge "Simpleperf: Support dwarf callgraph recording."
Tao Bao [Tue, 14 Jul 2015 00:56:38 +0000 (00:56 +0000)]
Merge "ext4_utils: Wrap wipe.h to be C++ compatible."
Paul Crowley [Tue, 14 Jul 2015 00:28:00 +0000 (00:28 +0000)]
am
b8e5034a: am
fa584713: Merge changes If63f439d,I697ec4ef into mnc-dr-dev
* commit '
b8e5034ab0a3172d61af84842ebd123520c1137f':
Add keyctl_revoke
Improve error logging.
Paul Crowley [Tue, 14 Jul 2015 00:27:59 +0000 (00:27 +0000)]
am
7b5b1667: am
d3548a38: Merge "Add e4crypt_set_user_crypto_policies, calls vdc setusercryptopolicies" into mnc-dr-dev
* commit '
7b5b1667674453ae04474f853245a6a671066bd2':
Add e4crypt_set_user_crypto_policies, calls vdc setusercryptopolicies
Tao Bao [Mon, 13 Jul 2015 23:54:02 +0000 (16:54 -0700)]
ext4_utils: Wrap wipe.h to be C++ compatible.
Change-Id: Ieae03dd1afb9ef2028e8f4adaddbf8e9e09142f8
Yabin Cui [Mon, 13 Jul 2015 23:34:11 +0000 (23:34 +0000)]
am
96f2bc51: am
e7da7e9b: Simpleperf: remove abort in child process.
* commit '
96f2bc51002a59fb77711a2a38e014cf13ac010c':
Simpleperf: remove abort in child process.
Yabin Cui [Mon, 13 Jul 2015 19:23:54 +0000 (12:23 -0700)]
Simpleperf: Support dwarf callgraph recording.
1. add OS_RELEASE and ARCH feature in perf.data. ARCH feature is used when parsing
recorded user registers.
2. support `--call-graph dwarf` option in record command.
Bug:
22229391
Change-Id: I56dbdd101338658ce6a9b59aa8be90e712e007f5
Paul Crowley [Mon, 13 Jul 2015 22:35:00 +0000 (22:35 +0000)]
am
fa584713: Merge changes If63f439d,I697ec4ef into mnc-dr-dev
* commit '
fa584713c935572966cf86529bbba9e011e001e9':
Add keyctl_revoke
Improve error logging.
Paul Crowley [Mon, 13 Jul 2015 22:34:54 +0000 (22:34 +0000)]
am
d3548a38: Merge "Add e4crypt_set_user_crypto_policies, calls vdc setusercryptopolicies" into mnc-dr-dev
* commit '
d3548a38a524f6f5ccddd87f806054fbb71da434':
Add e4crypt_set_user_crypto_policies, calls vdc setusercryptopolicies
Yabin Cui [Mon, 13 Jul 2015 22:30:39 +0000 (22:30 +0000)]
am
e7da7e9b: Simpleperf: remove abort in child process.
* commit '
e7da7e9b27ca050a12efa36207ea6b9218cc684d':
Simpleperf: remove abort in child process.
Yabin Cui [Mon, 13 Jul 2015 21:25:06 +0000 (21:25 +0000)]
am
577974bd: Merge "Simpleperf: remove unnecessary std::move."
* commit '
577974bd2ca37f9915ea924d7d84e046aa05f482':
Simpleperf: remove unnecessary std::move.
Paul Crowley [Mon, 13 Jul 2015 21:11:20 +0000 (21:11 +0000)]
Merge changes If63f439d,I697ec4ef into mnc-dr-dev
* changes:
Add keyctl_revoke
Improve error logging.
Yabin Cui [Mon, 13 Jul 2015 21:01:34 +0000 (21:01 +0000)]
Merge "Simpleperf: remove unnecessary std::move."
Paul Crowley [Mon, 13 Jul 2015 20:52:27 +0000 (20:52 +0000)]
Merge "Add e4crypt_set_user_crypto_policies, calls vdc setusercryptopolicies" into mnc-dr-dev
Yabin Cui [Mon, 13 Jul 2015 19:44:21 +0000 (12:44 -0700)]
Simpleperf: remove unnecessary std::move.
Bug:
19483574
Change-Id: I2b49ded640c799058b448ddce7f92b5cecd86de3
Paul Crowley [Mon, 13 Jul 2015 15:55:55 +0000 (15:55 +0000)]
am
3b10d619: am
ccaca5cb: Merge "Don\'t apply default encryption to /data/user, it should get per-user encryption." into mnc-dr-dev
* commit '
3b10d6195ad6d147d32306f734a64e50a51bbccd':
Don't apply default encryption to /data/user, it should get per-user encryption.
Paul Crowley [Mon, 13 Jul 2015 15:11:35 +0000 (15:11 +0000)]
am
ccaca5cb: Merge "Don\'t apply default encryption to /data/user, it should get per-user encryption." into mnc-dr-dev
* commit '
ccaca5cb8971837afe96f5b2940d266a95efd564':
Don't apply default encryption to /data/user, it should get per-user encryption.