OSDN Git Service
The Android Automerger [Sun, 20 Dec 2015 08:03:09 +0000 (00:03 -0800)]
merge in nyc-release history after reset to master
Josh Gao [Fri, 18 Dec 2015 21:45:10 +0000 (21:45 +0000)]
Merge "memory_replay: add .clang-format." am:
584d0d68d9
am:
4a58dd03f4
* commit '
4a58dd03f458e3eb874c7c9bdce71b136e1e6b6a':
memory_replay: add .clang-format.
Josh Gao [Fri, 18 Dec 2015 21:41:29 +0000 (21:41 +0000)]
Merge "memory_replay: add .clang-format."
am:
584d0d68d9
* commit '
584d0d68d9a1a0d2bd74e852c3570c6a415e9979':
memory_replay: add .clang-format.
Josh Gao [Fri, 18 Dec 2015 21:36:14 +0000 (21:36 +0000)]
Merge "memory_replay: add .clang-format."
Lorenzo Colitti [Fri, 18 Dec 2015 21:01:41 +0000 (21:01 +0000)]
Merge changes Ib0ab1722,Id5b1b351 am:
abf5656527
am:
108eef5e2d
* commit '
108eef5e2d56f572a9dca0365195a295def1c9be':
Don't create TIME-WAIT sockets in CreateSocketPair.
Add support for the sock_diag netlink interface.
Lorenzo Colitti [Fri, 18 Dec 2015 19:27:30 +0000 (11:27 -0800)]
Merge changes Ib0ab1722,Id5b1b351
am:
abf5656527
* commit '
abf5656527ec767fdf306fbf703f73a10e4ae3d6':
Don't create TIME-WAIT sockets in CreateSocketPair.
Add support for the sock_diag netlink interface.
Lorenzo Colitti [Fri, 18 Dec 2015 06:02:06 +0000 (06:02 +0000)]
Merge changes Ib0ab1722,Id5b1b351
* changes:
Don't create TIME-WAIT sockets in CreateSocketPair.
Add support for the sock_diag netlink interface.
Sami Tolvanen [Fri, 18 Dec 2015 01:49:06 +0000 (01:49 +0000)]
Merge "libfec: handle IO errors" am:
f2f800951a
am:
e08de37c7a
* commit '
e08de37c7a3d23901a86948f78afe74ce00f2b68':
libfec: handle IO errors
Sami Tolvanen [Thu, 17 Dec 2015 18:25:50 +0000 (18:25 +0000)]
Merge "libfec: handle IO errors"
am:
f2f800951a
* commit '
f2f800951aa3ec920a719556d71c2fbee734209d':
libfec: handle IO errors
Sami Tolvanen [Thu, 17 Dec 2015 18:20:11 +0000 (18:20 +0000)]
Merge "libfec: handle IO errors"
Sami Tolvanen [Thu, 17 Dec 2015 13:36:03 +0000 (13:36 +0000)]
libfec: handle IO errors
Treat IO errors as corruption and attempt to recover instead of
instantly failing.
Change-Id: I5abbe9a95d654c636ce013e3c0928e170a0e2c66
The Android Automerger [Thu, 17 Dec 2015 08:02:16 +0000 (00:02 -0800)]
merge in nyc-release history after reset to master
Josh Gao [Thu, 17 Dec 2015 03:51:24 +0000 (19:51 -0800)]
memory_replay: add .clang-format.
Change-Id: Iac3924bb7c9602762a3413aa529b9dec981c75e3
Andreas Gampe [Wed, 16 Dec 2015 23:44:08 +0000 (23:44 +0000)]
Merge "Binder: Fix unused parameter in benchmark" am:
d9f71f5ff3
am:
af24b4ef5e
* commit '
af24b4ef5e4b8cd2dadc931df9ffc2ee783fc81a':
Binder: Fix unused parameter in benchmark
Andreas Gampe [Wed, 16 Dec 2015 21:37:17 +0000 (13:37 -0800)]
Merge "Binder: Fix unused parameter in benchmark"
am:
d9f71f5ff3
* commit '
d9f71f5ff33cd268d795f5ff6177f5dbfe5e3578':
Binder: Fix unused parameter in benchmark
Andreas Gampe [Wed, 16 Dec 2015 21:27:42 +0000 (21:27 +0000)]
Merge "Binder: Fix unused parameter in benchmark"
Andreas Gampe [Wed, 16 Dec 2015 20:50:15 +0000 (12:50 -0800)]
Binder: Fix unused parameter in benchmark
Make build less noisy.
Bug:
18632512
Change-Id: I8a7ea6a9b9f7c40862d4ec73d50c966cb9da31e9
The Android Automerger [Wed, 16 Dec 2015 08:03:07 +0000 (00:03 -0800)]
merge in nyc-release history after reset to master
Elliott Hughes [Tue, 15 Dec 2015 16:17:35 +0000 (08:17 -0800)]
Merge "Remove memtest\'s crash test." am:
4f5860d9e1
am:
ec29dd6cf0
* commit '
ec29dd6cf0f4ebdb876798de94aa84ad09880c19':
Remove memtest's crash test.
Elliott Hughes [Tue, 15 Dec 2015 16:04:08 +0000 (16:04 +0000)]
Merge "Remove memtest\'s crash test."
am:
4f5860d9e1
* commit '
4f5860d9e13d1bab0f6466134016c37bf5d880aa':
Remove memtest's crash test.
Elliott Hughes [Tue, 15 Dec 2015 16:02:52 +0000 (16:02 +0000)]
Merge "Remove system/extras/tests/bionic." am:
1205856a99
am:
e256a84664
* commit '
e256a846649b98124e670025b20da6521b487d30':
Remove system/extras/tests/bionic.
Elliott Hughes [Tue, 15 Dec 2015 15:46:33 +0000 (15:46 +0000)]
Merge "Remove system/extras/tests/bionic."
am:
1205856a99
* commit '
1205856a997bd49d44f963433050e71f02f92e8d':
Remove system/extras/tests/bionic.
Elliott Hughes [Tue, 15 Dec 2015 02:22:42 +0000 (02:22 +0000)]
Merge "Remove memtest's crash test."
Elliott Hughes [Tue, 15 Dec 2015 01:44:23 +0000 (17:44 -0800)]
Remove memtest's crash test.
debuggerd's "crasher" has an extensive range of different crashes,
ported to all supported architectures.
Change-Id: I881002f5eb20c7bf87f1add2673216439a92d56c
Elliott Hughes [Tue, 15 Dec 2015 01:40:32 +0000 (01:40 +0000)]
Merge "Remove system/extras/tests/bionic."
Elliott Hughes [Tue, 15 Dec 2015 01:36:29 +0000 (17:36 -0800)]
Remove system/extras/tests/bionic.
Everything is now tested better by bionic itself, and as part of CTS.
Change-Id: Ie23e50b5ece911b650ad5abda8230bf7a8d3a452
Elliott Hughes [Tue, 15 Dec 2015 01:08:32 +0000 (01:08 +0000)]
Merge "Remove obsolete system/extras/timeinfo." am:
076617a200
am:
6810c0d6ef
* commit '
6810c0d6ef9aa90ab2ebf3172438326d5a3950c1':
Remove obsolete system/extras/timeinfo.
Elliott Hughes [Tue, 15 Dec 2015 00:51:58 +0000 (00:51 +0000)]
Merge "Remove obsolete system/extras/timeinfo."
am:
076617a200
* commit '
076617a2001f80c3c06cd7eacffeeda1030a6fd0':
Remove obsolete system/extras/timeinfo.
Elliott Hughes [Tue, 15 Dec 2015 00:18:25 +0000 (00:18 +0000)]
Merge "Remove obsolete system/extras/timeinfo."
Elliott Hughes [Tue, 15 Dec 2015 00:11:16 +0000 (16:11 -0800)]
Remove obsolete system/extras/timeinfo.
Not touched since cupcake.
Change-Id: I22ad0bfe3897ed590d0d6d17e04dc7dfced7bff2
Gopinath [Mon, 14 Dec 2015 20:27:51 +0000 (12:27 -0800)]
Binary setup for mmapPerf
Output mmapPerf to local/tmp
Output both 32bit and 64 bit binaries.
Change-Id: I30dccf5aa505194276c3369c3dfe8974e1d34c34
Lorenzo Colitti [Mon, 14 Dec 2015 14:21:51 +0000 (23:21 +0900)]
Don't create TIME-WAIT sockets in CreateSocketPair.
Some tests create lots of socket pairs, and the resulting
TIME-WAIT sockets can cause subsequent tests to fail when
binding.
Change-Id: Ib0ab1722cfa9891d177a805a84807c6f58550dd4
Lorenzo Colitti [Thu, 29 Oct 2015 14:51:25 +0000 (23:51 +0900)]
Add support for the sock_diag netlink interface.
Change-Id: Id5b1b3516d0a708bcfd69ae0e182dc39fe225934
Lorenzo Colitti [Mon, 14 Dec 2015 08:16:14 +0000 (00:16 -0800)]
Merge "Deal with flowlabel randomization." am:
8056a9bdfc
am:
d521ca9c93
* commit '
d521ca9c93ec250478bb4092caa0b39c1e2e4ac9':
Deal with flowlabel randomization.
Lorenzo Colitti [Mon, 14 Dec 2015 08:13:40 +0000 (00:13 -0800)]
Merge "Deal with flowlabel randomization."
am:
8056a9bdfc
* commit '
8056a9bdfcaf8b8776eccbae3ec29560679e867e':
Deal with flowlabel randomization.
Lorenzo Colitti [Mon, 14 Dec 2015 08:13:40 +0000 (00:13 -0800)]
Merge changes Ibab1eb74,I08e82f70,I9f8bb375 am:
414cff342d
am:
d8054a1d69
* commit '
d8054a1d69ddc86c5181f4376bf7aef026d7aa30':
Support properly resetting non-SYN, non-FIN packets.
Add a tests that checks NAs with the R flag set to 0.
Add utility functions to neighbour_test.
Lorenzo Colitti [Mon, 14 Dec 2015 08:11:18 +0000 (00:11 -0800)]
Merge changes Ibab1eb74,I08e82f70,I9f8bb375
am:
414cff342d
* commit '
414cff342d09380340cd6164d82b7d9416bc15a1':
Support properly resetting non-SYN, non-FIN packets.
Add a tests that checks NAs with the R flag set to 0.
Add utility functions to neighbour_test.
Lorenzo Colitti [Mon, 14 Dec 2015 08:09:48 +0000 (08:09 +0000)]
Merge "Deal with flowlabel randomization."
Lorenzo Colitti [Mon, 14 Dec 2015 08:06:26 +0000 (08:06 +0000)]
Merge changes Ibab1eb74,I08e82f70,I9f8bb375
* changes:
Support properly resetting non-SYN, non-FIN packets.
Add a tests that checks NAs with the R flag set to 0.
Add utility functions to neighbour_test.
Lorenzo Colitti [Fri, 11 Dec 2015 07:30:17 +0000 (16:30 +0900)]
Deal with flowlabel randomization.
Recent kernels randomize flowlabels by default. This causes our
packet comparisons to fail. Fix this by copying over the
flowlabel like we do with the IP id and the DF bit.
Change-Id: I8cf2685e622d89ca25fab443bab3bb1c3079b076
Lorenzo Colitti [Wed, 9 Dec 2015 13:23:58 +0000 (22:23 +0900)]
Support properly resetting non-SYN, non-FIN packets.
Change-Id: Ibab1eb744a6223007851abdd272b990ad360a9e4
Lorenzo Colitti [Mon, 14 Dec 2015 07:44:20 +0000 (16:44 +0900)]
Add a tests that checks NAs with the R flag set to 0.
NAs with R=0 have been implicated in loss of connectivity. This
test checks that they behave as expected.
Change-Id: I08e82f704cde4f40b423c8f52a34fef1ebfd74ee
Lorenzo Colitti [Mon, 14 Dec 2015 06:41:30 +0000 (15:41 +0900)]
Add utility functions to neighbour_test.
1. Clear the ND cache entries for the IPv6 routers before each
test, so we can add tests and always start from a clean slate.
2. Support expecting multicast NS.
3. Support generating NAs with different source and destination
addresses.
Change-Id: I9f8bb37540efa2d237eb236059e859f42aacdadc
The Android Automerger [Sun, 13 Dec 2015 08:02:53 +0000 (00:02 -0800)]
merge in nyc-release history after reset to master
Alex Deymo [Fri, 11 Dec 2015 17:28:16 +0000 (09:28 -0800)]
Merge "Rename libext2 host libraries to standard suffix." am:
f8a6eb443f
am:
260f4e3106
* commit '
260f4e3106fe5a957f4bc0844656b0750bff699b':
Rename libext2 host libraries to standard suffix.
David Zeuthen [Fri, 11 Dec 2015 17:27:31 +0000 (09:27 -0800)]
Merge "bootctl: add is-slot-marked-successful command." am:
71dddf50ce
am:
b9a9321258
* commit '
b9a9321258f6a40ffd780e6af5cfed431b5028ff':
bootctl: add is-slot-marked-successful command.
Todd Kjos [Fri, 11 Dec 2015 16:09:08 +0000 (16:09 +0000)]
Merge "Changes to support automated test framework"
Alex Deymo [Thu, 10 Dec 2015 01:55:36 +0000 (17:55 -0800)]
Rename libext2 host libraries to standard suffix.
libext2_uuid_host was renamed to libext2_uuid-host to match the
"-host" suffix used in most libraries.
Bug:
24619596
TEST=m
(cherry picked from commit
c5250dbccc217b984e141d99dc4b36d4bcf152c3)
Change-Id: I877dd8a5211256006582de19246c40795cc61343
Alex Deymo [Thu, 10 Dec 2015 22:28:29 +0000 (14:28 -0800)]
Merge "Rename libext2 host libraries to standard suffix."
am:
f8a6eb443f
* commit '
f8a6eb443f7ed8bc22d74c876d243c63a2d7f2f6':
Rename libext2 host libraries to standard suffix.
Alex Deymo [Thu, 10 Dec 2015 22:18:33 +0000 (22:18 +0000)]
Merge "Rename libext2 host libraries to standard suffix."
Greg Hackmann [Wed, 9 Dec 2015 22:55:53 +0000 (14:55 -0800)]
procrank: prefer new zram ABI
Starting with Linux 4.1, reading from /dev/block/zram*/mem_used_total
logs this warning:
"Attribute mem_used_total (and others) will be removed. See zram
documentation."
mem_used_total and several related counters are now consolidated under a
new node mm_stat. Prefer that when it's available.
Bug:
25951511
Change-Id: Ida732ee56a1e39e01c390f61bb40b3f52f643004
Signed-off-by: Greg Hackmann <ghackmann@google.com>
David Zeuthen [Thu, 10 Dec 2015 21:24:58 +0000 (13:24 -0800)]
Merge "bootctl: add is-slot-marked-successful command."
am:
71dddf50ce
* commit '
71dddf50cec9c21b24146901cdd1ce3dee44f4d7':
bootctl: add is-slot-marked-successful command.
David Zeuthen [Thu, 10 Dec 2015 21:17:29 +0000 (21:17 +0000)]
Merge "bootctl: add is-slot-marked-successful command."
David Zeuthen [Thu, 10 Dec 2015 21:09:17 +0000 (16:09 -0500)]
bootctl: add is-slot-marked-successful command.
This makes it easy to call the newly added isSlotMarkedSuccessful()
boot_control HAL method added in the CL at
https://android-review.googlesource.com/#/c/185841/
This is useful for e.g. test suites.
Also improve error reporting for is-slot-bootable command.
Change-Id: I603e07d8310fc1de88114dadbaa1622a76289afb
Test: tested on edison (Brillo).
Todd Kjos [Wed, 9 Dec 2015 23:37:54 +0000 (15:37 -0800)]
Changes to support automated test framework
- output conforms to frameworks expected format
- take an argument to specify file size
- allow 32-bit builds
BUG:
26094894
Change-Id: I63b170693cf60c018341e67ce30fd3795689728b
Paul Lawrence [Thu, 10 Dec 2015 15:10:30 +0000 (15:10 +0000)]
Merge "Add createuserkey"
Lorenzo Colitti [Thu, 10 Dec 2015 12:57:06 +0000 (04:57 -0800)]
Merge "Move CreateSocketPair to net_test.py so we can use it elsewhere." am:
001077aa92
am:
57e0e4d46e
* commit '
57e0e4d46e04a87db378888f6d5e3844984378e2':
Move CreateSocketPair to net_test.py so we can use it elsewhere.
Lorenzo Colitti [Thu, 10 Dec 2015 12:54:54 +0000 (04:54 -0800)]
Merge "Move CreateSocketPair to net_test.py so we can use it elsewhere."
am:
001077aa92
* commit '
001077aa9293cd52ac4b4b34132eacd9b9a6ad23':
Move CreateSocketPair to net_test.py so we can use it elsewhere.
Lorenzo Colitti [Thu, 10 Dec 2015 12:49:40 +0000 (12:49 +0000)]
Merge "Move CreateSocketPair to net_test.py so we can use it elsewhere."
The Android Automerger [Thu, 10 Dec 2015 08:01:30 +0000 (00:01 -0800)]
merge in nyc-release history after reset to master
Alex Deymo [Thu, 10 Dec 2015 01:55:36 +0000 (17:55 -0800)]
Rename libext2 host libraries to standard suffix.
libext2_uuid_host was renamed to libext2_uuid-host to match the
"-host" suffix used in most libraries.
Bug:
24619596
TEST=m
Change-Id: Ia417e1e65fa7ee54baac1007c057fe2571bf8196
Paul Lawrence [Wed, 9 Dec 2015 21:54:09 +0000 (13:54 -0800)]
Add createuserkey
Add createuserkey so we can create user0 key on first boot
Change-Id: I211a5a483c416da08239341f85eaf6eb99dca797
Lorenzo Colitti [Wed, 9 Dec 2015 13:56:54 +0000 (05:56 -0800)]
Merge "Minor changes to netlink code." am:
6ccb30917e
am:
771f46f216
* commit '
771f46f21687031ea436a52cc4311cd90b0631c7':
Minor changes to netlink code.
Lorenzo Colitti [Wed, 9 Dec 2015 13:54:15 +0000 (05:54 -0800)]
Merge "Minor changes to netlink code."
am:
6ccb30917e
* commit '
6ccb30917e16d709c269e75c5d1ab85e34eb52e1':
Minor changes to netlink code.
Lorenzo Colitti [Tue, 10 Nov 2015 08:13:43 +0000 (17:13 +0900)]
Move CreateSocketPair to net_test.py so we can use it elsewhere.
Change-Id: Ic46e1b9ffb9d1d6082c0453baaad71a3d43b432f
Lorenzo Colitti [Wed, 9 Dec 2015 13:49:46 +0000 (13:49 +0000)]
Merge "Minor changes to netlink code."
Lorenzo Colitti [Tue, 10 Nov 2015 07:59:37 +0000 (16:59 +0900)]
Minor changes to netlink code.
1. Remove IpRoute._Debug, since it's identical to the superclass
version.
2. Add some setsockopt constants to netlink.py.
3. Do the right thing if the kernel returns an error in a dump
request.
Change-Id: I37e49b35f1366760a408c7c4a73f95164d796a2e
The Android Automerger [Wed, 9 Dec 2015 08:01:33 +0000 (00:01 -0800)]
merge in nyc-release history after reset to master
Yabin Cui [Wed, 9 Dec 2015 03:38:48 +0000 (03:38 +0000)]
Merge "Simpleperf: check value returned by fopen." am:
4818f026d4
am:
2cc3db947b
* commit '
2cc3db947bedb8e562d123bbb1b75af286f983c0':
Simpleperf: check value returned by fopen.
Yabin Cui [Wed, 9 Dec 2015 03:36:29 +0000 (03:36 +0000)]
Merge "Simpleperf: check value returned by fopen."
am:
4818f026d4
* commit '
4818f026d4c35683222b84976de17da18ae178bb':
Simpleperf: check value returned by fopen.
Yabin Cui [Wed, 9 Dec 2015 03:31:51 +0000 (03:31 +0000)]
Merge "Simpleperf: check value returned by fopen."
Yabin Cui [Wed, 9 Dec 2015 03:25:13 +0000 (19:25 -0800)]
Simpleperf: check value returned by fopen.
Change-Id: Iecddf0b7805ccc2ad930bab2cdfcefa0702e5661
Yabin Cui [Wed, 9 Dec 2015 02:51:22 +0000 (02:51 +0000)]
Merge "Simpleperf: check if elf file paths are valid before reading them." am:
95c06b156f
am:
f5c9df2769
* commit '
f5c9df2769496da6ffd768f0a1c4a84d4d522580':
Simpleperf: check if elf file paths are valid before reading them.
Yabin Cui [Wed, 9 Dec 2015 02:49:07 +0000 (02:49 +0000)]
Merge "Simpleperf: check if elf file paths are valid before reading them."
am:
95c06b156f
* commit '
95c06b156fd8008b74eac9720f933f479f84a340':
Simpleperf: check if elf file paths are valid before reading them.
Yabin Cui [Wed, 9 Dec 2015 02:44:06 +0000 (02:44 +0000)]
Merge "Simpleperf: check if elf file paths are valid before reading them."
Yabin Cui [Wed, 9 Dec 2015 01:43:15 +0000 (17:43 -0800)]
Simpleperf: check if elf file paths are valid before reading them.
Reading invalid file paths can cause troubles. For example,
reading /dev/zero can eat all memory.
Bug:
25194400
Change-Id: I4de17f4f9200a43b50a4efe4c42a6fd9eaec1ba6
Elliott Hughes [Wed, 9 Dec 2015 01:22:28 +0000 (01:22 +0000)]
resolve merge conflicts of
836476d90d to mnc-dr2-dev-plus-aosp.
am:
f43f6cf5c3
* commit '
f43f6cf5c3b9ab4b0831cb0f4ce10969a33583d5':
Fix showmap SIGSEGV.
Elliott Hughes [Wed, 9 Dec 2015 01:17:48 +0000 (17:17 -0800)]
resolve merge conflicts of
836476d90d to mnc-dr2-dev-plus-aosp.
Change-Id: I8ae0ceb96f8bfe706cdaa4a512bf52935667600c
Elliott Hughes [Tue, 8 Dec 2015 23:41:35 +0000 (23:41 +0000)]
Merge "Prevent future instances of the last bug." am:
113206fb65
am:
51942bedde
* commit '
51942bedde56abe862f4d13af9ee27b916175d23':
Prevent future instances of the last bug.
Elliott Hughes [Tue, 8 Dec 2015 23:41:31 +0000 (23:41 +0000)]
Fix showmap SIGSEGV.
am:
e2534e30bc
* commit '
e2534e30bc558035b1fb1036241e2063151be723':
Fix showmap SIGSEGV.
Elliott Hughes [Tue, 8 Dec 2015 23:38:33 +0000 (23:38 +0000)]
Merge "Prevent future instances of the last bug."
am:
113206fb65
* commit '
113206fb6548cf95bdb91821c7b4dd384c926756':
Prevent future instances of the last bug.
Elliott Hughes [Tue, 8 Dec 2015 23:32:38 +0000 (23:32 +0000)]
Merge "Prevent future instances of the last bug."
Thierry Strudel [Tue, 8 Dec 2015 22:59:46 +0000 (14:59 -0800)]
librank: fix pm_memusage_t init and layout
pm_memusage_t variables must be initialized to 0 or call initializer.
Bug:
26083907
Change-Id: I62882be13de9c546e73bcdc24ec43ed0d5251db1
Elliott Hughes [Tue, 8 Dec 2015 23:22:33 +0000 (23:22 +0000)]
Merge "Fix showmap SIGSEGV." am:
8a72d54a4f
am:
29a53cf9c8
* commit '
29a53cf9c8b1f1267b5a0cd14ad5461163f14d56':
Fix showmap SIGSEGV.
Thierry Strudel [Tue, 8 Dec 2015 23:20:07 +0000 (23:20 +0000)]
librank: fix pm_memusage_t init and layout am:
76617ddbd1 am:
17c08c98fe
am:
f0c6dee6a9
* commit '
f0c6dee6a9639edc910779ea5987e028ebb4c7b0':
librank: fix pm_memusage_t init and layout
Elliott Hughes [Tue, 8 Dec 2015 23:19:59 +0000 (23:19 +0000)]
Merge "Fix showmap SIGSEGV."
am:
8a72d54a4f
* commit '
8a72d54a4f6636734f1f6a8a9d76022829f2001a':
Fix showmap SIGSEGV.
Elliott Hughes [Tue, 8 Dec 2015 22:57:22 +0000 (14:57 -0800)]
Fix showmap SIGSEGV.
Bug: http://b/
26084907
Change-Id: I6ed8a26b93d90348d2bb806ccd7752a1a76144a6
Elliott Hughes [Tue, 8 Dec 2015 23:13:36 +0000 (15:13 -0800)]
Prevent future instances of the last bug.
Also make the columns line up, and make it visible in the code that they
do now line up.
Bug: http://b/
26084907
Change-Id: If6abfffcafceab8e8d548c93fbbb13e371c79732
Thierry Strudel [Tue, 8 Dec 2015 23:15:35 +0000 (23:15 +0000)]
librank: fix pm_memusage_t init and layout am:
76617ddbd1
am:
17c08c98fe
* commit '
17c08c98fe93f3b7b9f1c291910fd488bd3a6027':
librank: fix pm_memusage_t init and layout
Thierry Strudel [Tue, 8 Dec 2015 23:12:53 +0000 (23:12 +0000)]
librank: fix pm_memusage_t init and layout
am:
76617ddbd1
* commit '
76617ddbd19525a8d82e7304a0e4b1c771438329':
librank: fix pm_memusage_t init and layout
Elliott Hughes [Tue, 8 Dec 2015 23:11:37 +0000 (23:11 +0000)]
Merge "Fix showmap SIGSEGV."
Elliott Hughes [Tue, 8 Dec 2015 23:05:34 +0000 (23:05 +0000)]
Merge "Showmap: show swap." am:
88add2dbc1
am:
4be7b235f9
* commit '
4be7b235f977911ae78d605e67da7d9b9d4a1856':
Showmap: show swap.
Elliott Hughes [Tue, 8 Dec 2015 23:02:48 +0000 (23:02 +0000)]
Merge "Showmap: show swap."
am:
88add2dbc1
* commit '
88add2dbc12ee79b3cc22bc70a71f857fe46b2b3':
Showmap: show swap.
Thierry Strudel [Tue, 8 Dec 2015 22:59:46 +0000 (14:59 -0800)]
librank: fix pm_memusage_t init and layout
pm_memusage_t variables must be initialized to 0 or call initializer.
Bug:
26083907
Change-Id: I62882be13de9c546e73bcdc24ec43ed0d5251db1
Elliott Hughes [Tue, 8 Dec 2015 22:57:22 +0000 (14:57 -0800)]
Fix showmap SIGSEGV.
Bug: http://b/
26084907
Change-Id: I6ed8a26b93d90348d2bb806ccd7752a1a76144a6
Elliott Hughes [Tue, 8 Dec 2015 22:56:18 +0000 (22:56 +0000)]
Merge "Showmap: show swap."
Martijn Coenen [Fri, 4 Dec 2015 16:22:15 +0000 (17:22 +0100)]
Showmap: show swap.
Bug:
26019993
Change-Id: I50a22a6be958dc336da0a1942989a164bb489937
Yabin Cui [Tue, 8 Dec 2015 21:24:19 +0000 (21:24 +0000)]
Merge "Simpleperf: add separate cpu_hotplug_test." am:
8460573b13
am:
ef3f6278f2
* commit '
ef3f6278f2505ef3ae0e24f236b7a14f9ba2d472':
Simpleperf: add separate cpu_hotplug_test.
Yabin Cui [Tue, 8 Dec 2015 21:21:04 +0000 (21:21 +0000)]
Merge "Simpleperf: add separate cpu_hotplug_test."
am:
8460573b13
* commit '
8460573b13e2cc3fc94ec6f7a25fac5885ad4ff1':
Simpleperf: add separate cpu_hotplug_test.
Yabin Cui [Tue, 8 Dec 2015 21:16:17 +0000 (21:16 +0000)]
Merge "Simpleperf: add separate cpu_hotplug_test."