OSDN Git Service
Mark Salyzyn [Thu, 14 Jan 2016 18:54:26 +0000 (18:54 +0000)]
Merge "Add time rtc ioctl tests"
am:
83ced5b8fb
* commit '
83ced5b8fb23d58e81efc13c617ca475e2f7e079':
Add time rtc ioctl tests
Mark Salyzyn [Thu, 14 Jan 2016 18:48:45 +0000 (18:48 +0000)]
Merge "Add time rtc ioctl tests"
Mark Salyzyn [Thu, 14 Jan 2016 15:28:21 +0000 (07:28 -0800)]
Add time rtc ioctl tests
- test read validity
- test year setting from 1970 to 2037 (2015+ critical)
- test year rollover operation (68 seconds to run test)
Bug:
26346842
Change-Id: I225ca2a25c291b9d05d75f5f39de2c6c753fcba1
Lorenzo Colitti [Thu, 14 Jan 2016 14:47:54 +0000 (14:47 +0000)]
Merge changes I1c396ab2,Ibf0223cc,Ibe49c873,I6aa1bb98,Ib091831c
am:
59c72161d7
* commit '
59c72161d70447232ee646d2cb9b756d76db91f3':
Make RTA_METRICS parsing work properly.
Slightly simplify dumping sockets.
Support specifying attributes in dump requests.
Don't run the sock_diag tests twice.
Test for a SOCK_DIAG oops on IPv4-mapped SYN_RECV connections.
Lorenzo Colitti [Thu, 14 Jan 2016 11:31:23 +0000 (11:31 +0000)]
Merge changes I1c396ab2,Ibf0223cc,Ibe49c873,I6aa1bb98,Ib091831c
* changes:
Make RTA_METRICS parsing work properly.
Slightly simplify dumping sockets.
Support specifying attributes in dump requests.
Don't run the sock_diag tests twice.
Test for a SOCK_DIAG oops on IPv4-mapped SYN_RECV connections.
Lorenzo Colitti [Thu, 14 Jan 2016 07:15:24 +0000 (16:15 +0900)]
Make RTA_METRICS parsing work properly.
Currently, parsing RTA_METRICS attributes only works if the
attributes only contain a single RTAX_MTU attribute, but not
other attributes.
This is because _ParseAttributes usually operates on netlink data
structures, and thus takes a data structure (such as a RTMsg
instance) as input. In the special case of the RTA_METRICS
attribute, _Decode calls _ParseAttributes on a blob of nested
attributes and not a data structure (which is correct), but
incorrectly passes in a msg of "RTMsg", which is a data structure
class, not an instance.
The result is that _Decode throws an exception when reading
msg.family. This was not never spotted before because _Decode
had a special hack to parse RTAX_MTU and we never happened to
parse a RTA_METRICS that contained anything else.
Fix this by passing None into _ParseAttributes when we know that
there is no message, and fetching msg.family in _ParseAttributes
only when we know that the message is in fact a rtmsg. This
allows us to merge the hack that parses RTAX_MTU with the code
that parses the other arguments. Also, support RTAX_HOPLIMIT,
which is the attribute which caused us to discover this problem.
Change-Id: I1c396ab29850e6cff95d2e7327ef6d702a8046f7
Lorenzo Colitti [Thu, 14 Jan 2016 04:25:29 +0000 (13:25 +0900)]
Slightly simplify dumping sockets.
- Remove the _DumpSockets method, since it's not useful.
- Make ALL_NON_TIME_WAIT the default.
Change-Id: Ibf0223ccfd9968e2e7223226ec3cb74ebd53f97c
Lorenzo Colitti [Thu, 14 Jan 2016 02:46:22 +0000 (11:46 +0900)]
Support specifying attributes in dump requests.
Change-Id: Ibe49c87397518eeb35132bc485093cc8d3aae39e
Lorenzo Colitti [Wed, 13 Jan 2016 16:47:36 +0000 (01:47 +0900)]
Don't run the sock_diag tests twice.
TcpTest inherits from SockDiagTest, which means it runs all the
SockDiagTest test methods as well. Fix this by making the two
inherit from a new base class with no test methods.
Change-Id: I6aa1bb987be00ba29317ab035f2ab3d3cb8e5b9e
Lorenzo Colitti [Tue, 12 Jan 2016 15:00:24 +0000 (00:00 +0900)]
Test for a SOCK_DIAG oops on IPv4-mapped SYN_RECV connections.
Change-Id: Ib091831cefd140161b020d9801bc7b1fa1e1ea76
Yabin Cui [Thu, 14 Jan 2016 04:15:30 +0000 (04:15 +0000)]
Merge "Simpleperf: fix --comms option for report cmd."
am:
5ded00750f
* commit '
5ded00750fef41142dc0dcd38664d20947a48bde':
Simpleperf: fix --comms option for report cmd.
Yabin Cui [Thu, 14 Jan 2016 04:12:23 +0000 (04:12 +0000)]
Merge "Simpleperf: fix --comms option for report cmd."
Yabin Cui [Wed, 13 Jan 2016 02:10:45 +0000 (18:10 -0800)]
Simpleperf: fix --comms option for report cmd.
Add corresponding runtest.
Adjust limitation in runtest.conf to pass tests on device.
Change-Id: Ie56dc6dc4dade3c13aaaa7022b871b5d8bfd69dc
Christopher Ferris [Tue, 12 Jan 2016 22:01:23 +0000 (22:01 +0000)]
Merge "Remove cpu benchmark."
am:
88be192396
* commit '
88be192396969e8603a6b320dcd27ae2be9b74a7':
Remove cpu benchmark.
Christopher Ferris [Tue, 12 Jan 2016 21:56:29 +0000 (21:56 +0000)]
Merge "Remove cpu benchmark."
Christopher Ferris [Tue, 12 Jan 2016 21:09:39 +0000 (13:09 -0800)]
Remove cpu benchmark.
This benchmark is completely misnamed. All it does is this in a hard loop:
- Read from memory and store in a register.
- Add one to the memory value.
- Store that value back to memory.
Since this is completely useless, I'm going to remove it.
Bug:
26210850
Change-Id: If3e0af0a1faa7875d3d106cccab1ed8205847b62
Yabin Cui [Tue, 12 Jan 2016 03:49:57 +0000 (03:49 +0000)]
Merge "Simpleperf: adjust sort strategy in RecordCache."
am:
aceefb77f8
* commit '
aceefb77f858d7f0737d36c52b7d0641b5683636':
Simpleperf: adjust sort strategy in RecordCache.
Yabin Cui [Tue, 12 Jan 2016 03:46:01 +0000 (03:46 +0000)]
Merge "Simpleperf: adjust sort strategy in RecordCache."
Yabin Cui [Tue, 12 Jan 2016 01:15:55 +0000 (17:15 -0800)]
Simpleperf: adjust sort strategy in RecordCache.
In order to report correctly, We should keep the order of self created
records when reading perf.data. So adjust sort strategy in RecordCache
to avoid reordering it.
Bug:
26214604
Change-Id: I40812ee5f4f6051103d40459edf4b4a2d7a80313
Than McIntosh [Mon, 11 Jan 2016 12:34:52 +0000 (12:34 +0000)]
Merge "Fix for simpleperf report on \'fugu\'."
am:
1ab9ea0f6f
* commit '
1ab9ea0f6f6eeb64c9a1440aad806dbc92b3f958':
Fix for simpleperf report on 'fugu'.
Than McIntosh [Mon, 11 Jan 2016 12:30:57 +0000 (12:30 +0000)]
Merge "Fix for simpleperf report on 'fugu'."
Colin Cross [Fri, 8 Jan 2016 23:50:33 +0000 (23:50 +0000)]
Merge "Make f2fs_ioutils depend on libselinux"
am:
d39da836fb
* commit '
d39da836fb598d4fb6ae9461c8043d18d0dc1568':
Make f2fs_ioutils depend on libselinux
Colin Cross [Fri, 8 Jan 2016 23:46:03 +0000 (23:46 +0000)]
Merge "Make f2fs_ioutils depend on libselinux"
Colin Cross [Fri, 8 Jan 2016 23:44:46 +0000 (15:44 -0800)]
Make f2fs_ioutils depend on libselinux
f2fs_ioutils uses selinux headers, add a dependency on libselinux.
Change-Id: I0dd983532c8899ccc6d7f56241e642b5add3f14a
Lorenzo Colitti [Wed, 6 Jan 2016 08:59:00 +0000 (08:59 +0000)]
Merge changes I11334802,I769518d1
am:
7e9e7f3b80
* commit '
7e9e7f3b8099345b6982e39cea09cb3d438dc1c8':
More SOCK_DESTROY test work
Add code and tests to close sockets via SOCK_DESTROY.
Lorenzo Colitti [Wed, 6 Jan 2016 08:55:54 +0000 (08:55 +0000)]
Merge changes I11334802,I769518d1
* changes:
More SOCK_DESTROY test work
Add code and tests to close sockets via SOCK_DESTROY.
Lorenzo Colitti [Sat, 19 Dec 2015 17:36:07 +0000 (02:36 +0900)]
More SOCK_DESTROY test work
- Test that killing a socket kills established but not accepted
children.
- Make tests a bit more readable.
Change-Id: I1133480233baf09d3f7bf73db612a82917ab0ca9
Lorenzo Colitti [Fri, 6 Nov 2015 07:42:06 +0000 (16:42 +0900)]
Add code and tests to close sockets via SOCK_DESTROY.
Change-Id: I769518d128fcff8035c58fbf3dc868f02fbd6c9d
Lorenzo Colitti [Wed, 6 Jan 2016 08:43:10 +0000 (08:43 +0000)]
Merge "Make getsockopt(SO_BINDTODEVICE) actually work."
am:
c526937fc3
* commit '
c526937fc3ba36afefaa42fbf795591968a26f59':
Make getsockopt(SO_BINDTODEVICE) actually work.
Lorenzo Colitti [Wed, 6 Jan 2016 08:39:42 +0000 (08:39 +0000)]
Merge "Make getsockopt(SO_BINDTODEVICE) actually work."
Lorenzo Colitti [Wed, 6 Jan 2016 08:07:19 +0000 (17:07 +0900)]
Make getsockopt(SO_BINDTODEVICE) actually work.
Also change "16" to "IFNAMSIZ" in various places.
Change-Id: Ib22c419e77dabf3bc6b1137b774daf5313b5ffeb
Lorenzo Colitti [Wed, 6 Jan 2016 08:00:28 +0000 (08:00 +0000)]
Merge changes I10fbb3bc,Iba2afc09
am:
09f36abb93
* commit '
09f36abb939ebad430a8b95beda70577c8fc1fa2':
Make GetSockDiag really return an InetDiagMsg, not a tuple.
Don't fail if getting SO_BINDTODEVICE is not yet supported.
Lorenzo Colitti [Wed, 6 Jan 2016 07:56:54 +0000 (07:56 +0000)]
Merge changes I10fbb3bc,Iba2afc09
* changes:
Make GetSockDiag really return an InetDiagMsg, not a tuple.
Don't fail if getting SO_BINDTODEVICE is not yet supported.
Lorenzo Colitti [Wed, 6 Jan 2016 07:37:20 +0000 (16:37 +0900)]
Make GetSockDiag really return an InetDiagMsg, not a tuple.
Change-Id: I10fbb3bcecfc61082a5cc67419bf3c6616615398
Lorenzo Colitti [Wed, 6 Jan 2016 07:25:34 +0000 (16:25 +0900)]
Don't fail if getting SO_BINDTODEVICE is not yet supported.
This makes sock_diag_test pass on android-3.4.
Change-Id: Iba2afc09b62e59e03c1368e9d1772da685ab0300
Lorenzo Colitti [Wed, 6 Jan 2016 07:24:08 +0000 (07:24 +0000)]
Merge changes I62ea60f8,If6613ec1
am:
e732b22a44
* commit '
e732b22a44ce9ee3745b368471b7a41399735c27':
Improvements to sock_diag code.
Enable various lock debugging options.
Lorenzo Colitti [Wed, 6 Jan 2016 07:21:31 +0000 (07:21 +0000)]
Merge changes I62ea60f8,If6613ec1
* changes:
Improvements to sock_diag code.
Enable various lock debugging options.
Lorenzo Colitti [Wed, 6 Jan 2016 06:58:14 +0000 (06:58 +0000)]
Merge "Add a convenience _GetMsg function and use it."
am:
590a20ffdc
* commit '
590a20ffdc2a6c57e4b0a5a855926ce9d2042c4d':
Add a convenience _GetMsg function and use it.
Lorenzo Colitti [Wed, 6 Jan 2016 06:55:18 +0000 (06:55 +0000)]
Merge "Add a convenience _GetMsg function and use it."
Lorenzo Colitti [Sat, 19 Dec 2015 04:40:48 +0000 (13:40 +0900)]
Improvements to sock_diag code.
1. Add a Dump convenience function that takes a request.
2. Add code to zero out uninitialized data in diag_msg.
3. Add more granular functions for constructing requests
(e.g., from sockets) without executing dumps.
4. Rename the Get* functions that scan socket dumps (such as
GetSockDiagForFd) to Find* to make it clear that they scan
dumps instead of asking the kernel for a particular socket.
Change-Id: I62ea60f888fe2dd50f5c5cf9dd680608a74097a3
Than McIntosh [Tue, 29 Dec 2015 18:56:10 +0000 (13:56 -0500)]
Fix for simpleperf report on 'fugu'.
Bug:
26345506
Change-Id: I2a736639b648d93442f0fa2b2000d7d5406bc4c9
Pavlin Radoslavov [Tue, 29 Dec 2015 01:28:42 +0000 (01:28 +0000)]
Merge "Use GID "wakelock" to control access to kernel wakelock"
am:
61b1065069
* commit '
61b10650690438354e829cad7135326a1b286934':
Use GID "wakelock" to control access to kernel wakelock
Pavlin Radoslavov [Tue, 29 Dec 2015 01:24:14 +0000 (01:24 +0000)]
Merge "Use GID "wakelock" to control access to kernel wakelock"
Pavlin Radoslavov [Tue, 24 Nov 2015 02:47:31 +0000 (18:47 -0800)]
Use GID "wakelock" to control access to kernel wakelock
Bug:
25864142
Change-Id: Ie0cc023ba702689468320dc25304380b3f5eaca3
Colin Cross [Tue, 22 Dec 2015 01:04:01 +0000 (01:04 +0000)]
Merge "libext4_utils: add dependency on libselinux"
am:
6beecb69bd
* commit '
6beecb69bd12240e3706222ea5a01f02f6c88761':
libext4_utils: add dependency on libselinux
Colin Cross [Tue, 22 Dec 2015 01:00:39 +0000 (01:00 +0000)]
Merge "libext4_utils: add dependency on libselinux"
Colin Cross [Tue, 22 Dec 2015 00:18:26 +0000 (16:18 -0800)]
libext4_utils: add dependency on libselinux
libext4_utils uses headers from libselinux, add a LOCAL_STATIC_LIBRARIES
dependency.
Change-Id: Ibce576b48a7f7b9a9d1a043c244d85717ce5f980
Sami Tolvanen [Mon, 21 Dec 2015 11:30:49 +0000 (11:30 +0000)]
Merge "fec: accept multiple input files for encoding"
am:
edbe55725f
* commit '
edbe55725fd262c3992c0e48c4fc5ce73ede2f9b':
fec: accept multiple input files for encoding
Sami Tolvanen [Mon, 21 Dec 2015 11:21:16 +0000 (11:21 +0000)]
Merge "fec: accept multiple input files for encoding"
Lorenzo Colitti [Mon, 21 Dec 2015 02:39:16 +0000 (11:39 +0900)]
Enable various lock debugging options.
Change-Id: If6613ec15ba54388fd87ff9271ba51b554960484
Lorenzo Colitti [Sat, 19 Dec 2015 04:08:30 +0000 (13:08 +0900)]
Add a convenience _GetMsg function and use it.
Change-Id: I2691dfd2cdd7ffcad8c41d74243e41643baf6805
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 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.
Sami Tolvanen [Fri, 18 Dec 2015 15:28:06 +0000 (15:28 +0000)]
fec: accept multiple input files for encoding
Make it possible to encode input files in pieces (not with -m).
Bug:
26251929
Change-Id: I09349368925e5e2f2a7961a712a1e933eb0b9ec8
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 [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
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 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
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 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 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
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: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: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
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."
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).
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."
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
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
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: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