OSDN Git Service
The Android Automerger [Tue, 2 Feb 2016 08:01:34 +0000 (00:01 -0800)]
merge in nyc-release history after reset to master
Paul Crowley [Mon, 1 Feb 2016 20:41:27 +0000 (20:41 +0000)]
Merge "Give init the means to invoke "cryptfs init_user0""
Paul Crowley [Mon, 1 Feb 2016 16:33:50 +0000 (16:33 +0000)]
Give init the means to invoke "cryptfs init_user0"
Init needs to initialize user 0 for FBE devices via a vdc command.
Bug:
26704408
Change-Id: Ide6d1fdcb55e87c22820310c6d1cf9640e77d25e
Paul Crowley [Thu, 28 Jan 2016 17:58:50 +0000 (17:58 +0000)]
Add support for per-user DE keys.
Bug:
26704408
Change-Id: I41b2d0641cce8db9e6b98e6e2f0c635426b1d1e2
The Android Automerger [Thu, 28 Jan 2016 08:02:04 +0000 (00:02 -0800)]
merge in nyc-release history after reset to master
The Android Automerger [Wed, 27 Jan 2016 08:02:19 +0000 (00:02 -0800)]
merge in nyc-release history after reset to master
Lorenzo Colitti [Wed, 27 Jan 2016 05:59:32 +0000 (05:59 +0000)]
Merge changes I3b881be8,I80d97bd5,Id115e8b2 am:
b764f45fd9
am:
91dcd99d9e
* commit '
91dcd99d9ebee7c0a41416fc7ea3fe74aa4a7f34':
Fix lint warnings.
Note a 3.18 commit in neighbour_test.py.
SOCK_DESTROY is no longer optional.
Lorenzo Colitti [Wed, 27 Jan 2016 05:57:32 +0000 (05:57 +0000)]
Merge changes I3b881be8,I80d97bd5,Id115e8b2
am:
b764f45fd9
* commit '
b764f45fd9758c8222bc08d7fa4944e8f7da6f40':
Fix lint warnings.
Note a 3.18 commit in neighbour_test.py.
SOCK_DESTROY is no longer optional.
Lorenzo Colitti [Wed, 27 Jan 2016 05:54:24 +0000 (05:54 +0000)]
Merge changes I3b881be8,I80d97bd5,Id115e8b2
* changes:
Fix lint warnings.
Note a 3.18 commit in neighbour_test.py.
SOCK_DESTROY is no longer optional.
Lorenzo Colitti [Tue, 26 Jan 2016 14:22:28 +0000 (23:22 +0900)]
Fix lint warnings.
Change-Id: I3b881be8b665ba790e7da79b3560c159d72be1e2
Dan Willemsen [Wed, 27 Jan 2016 00:01:44 +0000 (00:01 +0000)]
Merge "Remove header from LOCAL_SRC_FILES" am:
1287f6e0af
am:
6d88789b92
* commit '
6d88789b9268b8d9036bb5dd326a99831980d21e':
Remove header from LOCAL_SRC_FILES
Dan Willemsen [Tue, 26 Jan 2016 23:59:45 +0000 (23:59 +0000)]
Merge "Remove header from LOCAL_SRC_FILES"
am:
1287f6e0af
* commit '
1287f6e0afe146657a7d48167710947447e8693f':
Remove header from LOCAL_SRC_FILES
Dan Willemsen [Tue, 26 Jan 2016 23:55:09 +0000 (23:55 +0000)]
Merge "Remove header from LOCAL_SRC_FILES"
Mark Salyzyn [Tue, 26 Jan 2016 21:55:02 +0000 (21:55 +0000)]
Merge "rtc_test: EACCES acceptable for write" am:
2caf931ea6
am:
bf02d577a3
* commit '
bf02d577a3ca850cced4b7e9d35471ddc1067318':
rtc_test: EACCES acceptable for write
Mark Salyzyn [Tue, 26 Jan 2016 20:48:17 +0000 (20:48 +0000)]
Merge "rtc_test: EACCES acceptable for write"
am:
2caf931ea6
* commit '
2caf931ea6662f549e6f331d6a2638e560fb7715':
rtc_test: EACCES acceptable for write
Mark Salyzyn [Tue, 26 Jan 2016 20:41:12 +0000 (20:41 +0000)]
Merge "rtc_test: EACCES acceptable for write"
Mark Salyzyn [Tue, 26 Jan 2016 19:18:48 +0000 (11:18 -0800)]
rtc_test: EACCES acceptable for write
If we can not write to /dev/rtc0, then accept result
Requires /dev/rtc0 to be something like mode 440.
Bug:
26792522
Change-Id: Ief2ac5cd1bac4b0272ef9d9bf096ed4000163244
Lorenzo Colitti [Tue, 26 Jan 2016 06:59:47 +0000 (15:59 +0900)]
Note a 3.18 commit in neighbour_test.py.
Change-Id: I80d97bd548c8d6749e48f4e8ff539808a7e1e0ab
Lorenzo Colitti [Mon, 25 Jan 2016 08:06:56 +0000 (17:06 +0900)]
SOCK_DESTROY is no longer optional.
Change-Id: Id115e8b2ef100e19ae063047be5ddfde0b60e3b0
The Android Automerger [Tue, 26 Jan 2016 08:01:58 +0000 (00:01 -0800)]
merge in nyc-release history after reset to master
Lorenzo Colitti [Tue, 26 Jan 2016 07:03:01 +0000 (07:03 +0000)]
Merge changes Ib1510f36,I8a2f50da,Ife74d135,Idfb19903 am:
9427861d27
am:
f86cf5eab5
* commit '
f86cf5eab5b2364769a1777df23ef8db1c1b82dc':
Refactor TCP test code into its own file.
Move some sock_diag tests around.
Teach more sock_diag code and tests about mapped sockets.
Delete the hack that finds mapped sockets.
Lorenzo Colitti [Tue, 26 Jan 2016 07:01:17 +0000 (07:01 +0000)]
Merge changes Ib1510f36,I8a2f50da,Ife74d135,Idfb19903
am:
9427861d27
* commit '
9427861d2746735378aa3dc628c917fac2acec83':
Refactor TCP test code into its own file.
Move some sock_diag tests around.
Teach more sock_diag code and tests about mapped sockets.
Delete the hack that finds mapped sockets.
Lorenzo Colitti [Tue, 26 Jan 2016 06:57:48 +0000 (06:57 +0000)]
Merge changes Ib1510f36,I8a2f50da,Ife74d135,Idfb19903
* changes:
Refactor TCP test code into its own file.
Move some sock_diag tests around.
Teach more sock_diag code and tests about mapped sockets.
Delete the hack that finds mapped sockets.
Dan Willemsen [Tue, 26 Jan 2016 03:55:37 +0000 (19:55 -0800)]
Remove header from LOCAL_SRC_FILES
The build system does not use headers in LOCAL_SRC_FILES. To prevent
typos, it's becoming a warning to add something to LOCAL_SRC_FILES that
is not used.
Change-Id: I0ced87726dae5fcd4209d9ff1f83fa611817ecd3
Christopher Ferris [Tue, 26 Jan 2016 01:59:12 +0000 (01:59 +0000)]
Merge "Add use of libbacktrace_offline." am:
99f24e6a75
am:
347d5ed57a
* commit '
347d5ed57a22018b021ed683b21b56be8b745a19':
Add use of libbacktrace_offline.
Christopher Ferris [Tue, 26 Jan 2016 01:56:56 +0000 (01:56 +0000)]
Merge "Add use of libbacktrace_offline."
am:
99f24e6a75
* commit '
99f24e6a75e07ec309fd9e5643f5167946061837':
Add use of libbacktrace_offline.
Christopher Ferris [Tue, 26 Jan 2016 01:50:26 +0000 (01:50 +0000)]
Merge "Add use of libbacktrace_offline."
Christopher Ferris [Tue, 26 Jan 2016 00:21:54 +0000 (16:21 -0800)]
Add use of libbacktrace_offline.
Change-Id: Ia8c16b3b82e4a19fcaedd21c05ab6bae5006f561
Lorenzo Colitti [Mon, 25 Jan 2016 15:32:06 +0000 (00:32 +0900)]
Refactor TCP test code into its own file.
Change-Id: Ib1510f3679f9d4eb651e21307b71873190e610fc
Lorenzo Colitti [Mon, 25 Jan 2016 14:43:15 +0000 (23:43 +0900)]
Move some sock_diag tests around.
Change-Id: I8a2f50da826bbf2a2c8d42bd3d05d53fc1f05932
Martijn Coenen [Mon, 25 Jan 2016 12:58:45 +0000 (12:58 +0000)]
Merge "Pagecache.py fixes and updates."
Martijn Coenen [Mon, 25 Jan 2016 12:49:33 +0000 (12:49 +0000)]
Merge "Fix up alloc-stress."
Lorenzo Colitti [Thu, 21 Jan 2016 03:02:27 +0000 (12:02 +0900)]
Teach more sock_diag code and tests about mapped sockets.
Change-Id: Ife74d135f4af33ccebe10ce7d42d4b43e37f9523
The Android Automerger [Sun, 24 Jan 2016 08:03:05 +0000 (00:03 -0800)]
merge in nyc-release history after reset to master
Yabin Cui [Sat, 23 Jan 2016 04:02:51 +0000 (04:02 +0000)]
Merge "Simpleperf: adjust default mmap_pages used when recording." am:
1554cbcd50
am:
f3f856e7e4
* commit '
f3f856e7e4952a13875937b3f246ff084bc8d9ec':
Simpleperf: adjust default mmap_pages used when recording.
Yabin Cui [Sat, 23 Jan 2016 04:01:05 +0000 (04:01 +0000)]
Merge "Simpleperf: adjust default mmap_pages used when recording."
am:
1554cbcd50
* commit '
1554cbcd50653d5c746eb46110929327256447a4':
Simpleperf: adjust default mmap_pages used when recording.
Yabin Cui [Sat, 23 Jan 2016 03:57:11 +0000 (03:57 +0000)]
Merge "Simpleperf: adjust default mmap_pages used when recording."
Yabin Cui [Fri, 22 Jan 2016 23:38:46 +0000 (15:38 -0800)]
Simpleperf: adjust default mmap_pages used when recording.
If running as non-root, there is a limitation on how many
mmap pages can be used for profiling per user. So adjust
default mmap_pages value to fit the limit, and add option
to change it.
Change-Id: Ie73f33c473498689234972989fc55b7731366792
Lorenzo Colitti [Fri, 22 Jan 2016 18:44:10 +0000 (18:44 +0000)]
Merge changes I2e3eb0b3,I2f7bd13e am:
cb698c387c
am:
b5dfec665a
* commit '
b5dfec665a8bb3d995c4e3285649b2f6a236441d':
Delete FixupDiagMsg and cite the commit that makes it unnecessary.
Add a test for a port comparison bytecode validation bug.
Lorenzo Colitti [Fri, 22 Jan 2016 18:44:06 +0000 (18:44 +0000)]
Merge changes I035cd9b6,I8ca9f205 am:
40fded7e6a
am:
abf2c81d1d
* commit '
abf2c81d1dba36cb71eed73d7a3a85bbefebb7ed':
Make the SOCK_DESTROY tests work again.
Make CloseSocketFromFd work on mapped sockets too.
Lorenzo Colitti [Thu, 21 Jan 2016 01:04:54 +0000 (10:04 +0900)]
Delete the hack that finds mapped sockets.
The kernel handles this for us as of net-next commit
fc439d9489479411fbf9bbbec2c768df89e85503
Change-Id: Idfb19903cdeb8b1c0f288e1b290332414e9565cd
Lorenzo Colitti [Fri, 22 Jan 2016 03:44:15 +0000 (03:44 +0000)]
Merge changes I2e3eb0b3,I2f7bd13e
am:
cb698c387c
* commit '
cb698c387cbb2ea0265bdbd85b89dd25d55afb42':
Delete FixupDiagMsg and cite the commit that makes it unnecessary.
Add a test for a port comparison bytecode validation bug.
Lorenzo Colitti [Fri, 22 Jan 2016 03:44:12 +0000 (03:44 +0000)]
Merge changes I035cd9b6,I8ca9f205
am:
40fded7e6a
* commit '
40fded7e6a300657d5f71f52a43d673a2f3f7446':
Make the SOCK_DESTROY tests work again.
Make CloseSocketFromFd work on mapped sockets too.
Lorenzo Colitti [Fri, 22 Jan 2016 03:41:14 +0000 (03:41 +0000)]
Merge changes I2e3eb0b3,I2f7bd13e
* changes:
Delete FixupDiagMsg and cite the commit that makes it unnecessary.
Add a test for a port comparison bytecode validation bug.
Lorenzo Colitti [Fri, 22 Jan 2016 03:40:06 +0000 (03:40 +0000)]
Merge changes I035cd9b6,I8ca9f205
* changes:
Make the SOCK_DESTROY tests work again.
Make CloseSocketFromFd work on mapped sockets too.
Paul Crowley [Thu, 21 Jan 2016 11:17:37 +0000 (11:17 +0000)]
Merge "Remove no-longer-needed crypto init builtins"
Paul Crowley [Thu, 21 Jan 2016 11:16:14 +0000 (11:16 +0000)]
Merge "Exclude several more directories in /data from encryption"
Paul Crowley [Wed, 20 Jan 2016 11:23:30 +0000 (11:23 +0000)]
Remove no-longer-needed crypto init builtins
Changes to the way FBE works to support lifecycles mean that these
commands aren't needed any more.
Bug:
22358539
Change-Id: I974f32c83c344403d5117bc02b7d67771123abaa
The Android Automerger [Wed, 20 Jan 2016 08:01:33 +0000 (00:01 -0800)]
merge in nyc-release history after reset to master
Paul Crowley [Tue, 19 Jan 2016 09:19:02 +0000 (09:19 +0000)]
Exclude several more directories in /data from encryption
Several directories need to be unencrypted so that policy can be set
on their subdirectories, so exclude them all from device-level
encryption.
This also excludes /data/misc, which must be encrypted for security.
However a weird bug with a disappearing /data/misc/vold was blocking
my development, so I included it here in order to make progress. See
b/
26673855
Bug:
22358539
Change-Id: Ied67264a42cc8f911c5ecb4acc5e2b650b8d06a7
Martijn Coenen [Tue, 19 Jan 2016 18:31:24 +0000 (10:31 -0800)]
Pagecache.py fixes and updates.
- Handle old version of stat that will append 'd' to inode
number.
- Added a '-f' option to parse and dump from trace files
- Fixed issue where we didn't show files that we only
removed pages from (and never added).
Change-Id: Ie8d48c01b3b6c288081178e7973aad22887795e0
Nick Kralevich [Tue, 19 Jan 2016 18:28:36 +0000 (18:28 +0000)]
Merge "key_control.cpp: Use linux/keyctl.h" am:
a17fc6dab2
am:
f95a3aad97
* commit '
f95a3aad974f97330e7284e9d9a613328780fe48':
key_control.cpp: Use linux/keyctl.h
Sami Tolvanen [Tue, 19 Jan 2016 18:28:32 +0000 (18:28 +0000)]
Merge "libfec: fix back-up header validation" am:
759656c095
am:
1a7960a6c7
* commit '
1a7960a6c73dacfece6b9351cf3188d001837607':
libfec: fix back-up header validation
Nick Kralevich [Tue, 19 Jan 2016 18:26:48 +0000 (18:26 +0000)]
Merge "key_control.cpp: Use linux/keyctl.h"
am:
a17fc6dab2
* commit '
a17fc6dab29c28244d7d5515db67822c18b62b58':
key_control.cpp: Use linux/keyctl.h
Nick Kralevich [Tue, 19 Jan 2016 18:21:56 +0000 (18:21 +0000)]
Merge "key_control.cpp: Use linux/keyctl.h"
Nick Kralevich [Tue, 19 Jan 2016 18:18:22 +0000 (10:18 -0800)]
key_control.cpp: Use linux/keyctl.h
Use linux/keyctl.h instead of copying the header definitions.
Change-Id: Ic3804d49671e4951d1d8869411f665e9f5eef674
Sami Tolvanen [Tue, 19 Jan 2016 13:18:56 +0000 (13:18 +0000)]
Merge "libfec: fix back-up header validation"
am:
759656c095
* commit '
759656c09532f1932f3d8be8f56d2eda1c9573d5':
libfec: fix back-up header validation
Sami Tolvanen [Tue, 19 Jan 2016 13:16:09 +0000 (13:16 +0000)]
Merge "libfec: fix back-up header validation"
The Android Automerger [Tue, 19 Jan 2016 08:01:33 +0000 (00:01 -0800)]
merge in nyc-release history after reset to master
Lorenzo Colitti [Sat, 16 Jan 2016 16:54:24 +0000 (01:54 +0900)]
Delete FixupDiagMsg and cite the commit that makes it unnecessary.
Change-Id: I2e3eb0b3f6e3be824c37c161813c3b1301fd796e
Lorenzo Colitti [Fri, 15 Jan 2016 17:30:59 +0000 (02:30 +0900)]
Make the SOCK_DESTROY tests work again.
These bitrotted due to changes to the tests developed on kernels
which don't yet have SOCK_DESTROY backported to them. Make minor
fixes to get them passing again:
1. Move asserts shared between TcpTest and SockDiagTest to
SockDiagBaseTest.
2. Make IncomingConnection not leave FIN_WAIT sockets around,
and check for their presence in testCrossFamilyBytecode, which
fails if any other sockets exist.
3. Make mapped addresses work in testConnectInterrupted.
Change-Id: I035cd9b6570ca83a411d6e12df46ce3e76554a19
Lorenzo Colitti [Sat, 16 Jan 2016 12:33:58 +0000 (21:33 +0900)]
Add a test for a port comparison bytecode validation bug.
Change-Id: I2f7bd13e96124c6342a21559ca8e086010e8c51a
Lorenzo Colitti [Fri, 15 Jan 2016 17:21:58 +0000 (02:21 +0900)]
Make CloseSocketFromFd work on mapped sockets too.
Change-Id: I8ca9f205fcca49391f2e20339c8a6ddc66f75c3c
Martijn Coenen [Mon, 18 Jan 2016 20:47:13 +0000 (20:47 +0000)]
Merge "Initial import of headless systrace analysis." am:
0aa440aea4
am:
4258431621
* commit '
4258431621ef3cd32d3cec9604fa17324299cc42':
Initial import of headless systrace analysis.
Martijn Coenen [Mon, 18 Jan 2016 20:45:14 +0000 (20:45 +0000)]
Merge "Initial import of headless systrace analysis."
am:
0aa440aea4
* commit '
0aa440aea4bb9960dc4daa69cc134bee20fb0245':
Initial import of headless systrace analysis.
Martijn Coenen [Mon, 18 Jan 2016 20:42:19 +0000 (20:42 +0000)]
Merge "Initial import of headless systrace analysis."
Martijn Coenen [Mon, 28 Sep 2015 14:18:39 +0000 (16:18 +0200)]
Initial import of headless systrace analysis.
Can dump the following on a per-process/activity basis:
- Time the process was running / activity in the foreground
- # of frames rendered, and their performance
- # of direct reclaims
- Amount of time spent on each CPU for key threads
- CPU frequency distribution
Change-Id: I449c5729a0cd4c27d1b810b669a86cd5ee7f4467
Sami Tolvanen [Mon, 18 Jan 2016 20:33:43 +0000 (20:33 +0000)]
libfec: fix back-up header validation
If the primary fec_header is invalid, correctly validate the
back-up header even if it's not at the beginning of a block.
Change-Id: Ida15e6eeb08f3d50d4e096897ccc814c0949e8f8
The Android Automerger [Mon, 18 Jan 2016 08:00:47 +0000 (00:00 -0800)]
merge in nyc-release history after reset to master
Martijn Coenen [Wed, 13 Jan 2016 12:41:54 +0000 (13:41 +0100)]
Fix up alloc-stress.
- Userspace now uses ranges -1000 to +1000 for oomadj
- Directly call into lmkd instead of writing oom_score-adj; this
allows alloc-stress to work with userspace lmkd
- If mem cgroups are enabled (future), create a mem cgroup for
the newly created process.
Change-Id: I4a28eef478cc5a9ad48abdf5bb87c98da3fce3ae
Yabin Cui [Sun, 17 Jan 2016 21:58:24 +0000 (21:58 +0000)]
Merge "Simpleperf: support build for windows." am:
9a9efec563
am:
6fcebf0c94
* commit '
6fcebf0c9449e9ece760ac80ef049e987e88e0c3':
Simpleperf: support build for windows.
Yabin Cui [Sun, 17 Jan 2016 21:56:51 +0000 (21:56 +0000)]
Merge "Simpleperf: support build for windows."
am:
9a9efec563
* commit '
9a9efec5634b318266dc823252ebde3c6f88986f':
Simpleperf: support build for windows.
Yabin Cui [Sun, 17 Jan 2016 21:01:03 +0000 (21:01 +0000)]
Merge "Simpleperf: support build for windows."
The Android Automerger [Sun, 17 Jan 2016 08:02:29 +0000 (00:02 -0800)]
merge in nyc-release history after reset to master
Yabin Cui [Fri, 15 Jan 2016 23:25:48 +0000 (15:25 -0800)]
Simpleperf: support build for windows.
Change-Id: I31554f36ee97eb0ae27bda9b77e29410776925e2
Lorenzo Colitti [Fri, 15 Jan 2016 13:27:49 +0000 (13:27 +0000)]
Merge changes I251088dc,I23d0191e am:
f1b30da793
am:
0fbab56d09
* commit '
0fbab56d090591ce248a520cd5364852fea14e90':
Test for a cross-family bytecode comparison bug.
Support checking structs for equality.
Lorenzo Colitti [Fri, 15 Jan 2016 13:26:06 +0000 (13:26 +0000)]
Merge changes I251088dc,I23d0191e
am:
f1b30da793
* commit '
f1b30da793ce64bb29364c1f8f0ab2f5817d03df':
Test for a cross-family bytecode comparison bug.
Support checking structs for equality.
Lorenzo Colitti [Fri, 15 Jan 2016 13:23:15 +0000 (13:23 +0000)]
Merge changes I251088dc,I23d0191e
* changes:
Test for a cross-family bytecode comparison bug.
Support checking structs for equality.
Lorenzo Colitti [Thu, 14 Jan 2016 08:40:30 +0000 (17:40 +0900)]
Test for a cross-family bytecode comparison bug.
Change-Id: I251088dc09d803a7448930cd155fc3a1c6c5bddf
Lorenzo Colitti [Thu, 14 Jan 2016 17:00:05 +0000 (02:00 +0900)]
Support checking structs for equality.
Also:
- Rename _fields to _fieldnames, because the history of this
CL shows that _fields is confusing
- Fix some lint errors.
Change-Id: I23d0191e6a588820b3697b2d36d70880ea921d8a
Lorenzo Colitti [Fri, 15 Jan 2016 02:53:56 +0000 (02:53 +0000)]
Merge "Add code and tests for inet_diag bytecode." am:
587993212d
am:
b16bd36d8e
* commit '
b16bd36d8e368cc27114ecb42db97c4fead9baa1':
Add code and tests for inet_diag bytecode.
Lorenzo Colitti [Fri, 15 Jan 2016 02:51:55 +0000 (02:51 +0000)]
Merge "Add code and tests for inet_diag bytecode."
am:
587993212d
* commit '
587993212d96766b6fb78610a6b04bf096b71e10':
Add code and tests for inet_diag bytecode.
Lorenzo Colitti [Fri, 15 Jan 2016 02:48:35 +0000 (02:48 +0000)]
Merge "Add code and tests for inet_diag bytecode."
Mark Salyzyn [Thu, 14 Jan 2016 20:20:16 +0000 (20:20 +0000)]
Merge "Add time rtc ioctl tests" am:
83ced5b8fb
am:
7ba54e14c7
* commit '
7ba54e14c7bcb40169233571ebfb32821c6abba7':
Add time rtc ioctl tests
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:49:51 +0000 (14:49 +0000)]
Merge changes I1c396ab2,Ibf0223cc,Ibe49c873,I6aa1bb98,Ib091831c am:
59c72161d7
am:
45801c4bb2
* commit '
45801c4bb2217e245671dd6d709a34fe4f7bb342':
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 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.
The Android Automerger [Thu, 14 Jan 2016 13:32:53 +0000 (05:32 -0800)]
merge in nyc-release history after reset to master
Lorenzo Colitti [Thu, 14 Jan 2016 02:49:33 +0000 (11:49 +0900)]
Add code and tests for inet_diag bytecode.
Change-Id: I02af43151cf14905cc762455f282cb7fa5a1b003
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
Yabin Cui [Thu, 14 Jan 2016 06:15:04 +0000 (06:15 +0000)]
Merge "Simpleperf: fix --comms option for report cmd." am:
5ded00750f
am:
3c81380ecb
* commit '
3c81380ecb2bc8c3f4a0e86cd5b454df794a1704':
Simpleperf: fix --comms option for report cmd.
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."