summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am d966eebf: Merge "Fix build."Elliott Hughes2013-11-212-1/+2
|\ | | | | | | | | * commit 'd966eebfcba313477a598ad7b3e573a123a7a9af': Fix build.
| * Merge "Fix build."Elliott Hughes2013-11-222-1/+2
| |\
| | * Fix build.Elliott Hughes2013-11-212-1/+2
| |/ | | | | | | Change-Id: I6552bf9f83faa97bd5a844381aceb3ef85f86c76
* | am a6fbc0f9: Merge "Replace __reboot call with syscall"Elliott Hughes2013-11-211-1/+2
|\ \ | |/ | | | | | | * commit 'a6fbc0f9f49b797f4a67ea49f37681c08ab41111': Replace __reboot call with syscall
| * Merge "Replace __reboot call with syscall"Elliott Hughes2013-11-211-1/+2
| |\
| | * Replace __reboot call with syscallPavel Chupin2013-11-211-1/+2
| |/ | | | | | | | | | | | | __reboot is hidden for 64-bits and should be hidden on others Change-Id: Ib6435269aac7fa726e49cc02f8f76d2be2875bc6 Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
* | am 048bb92f: Merge "split setptop ethernet tcp buffer from wifi"Elliott Hughes2013-11-201-11/+12
|\ \ | |/ | | | | | | * commit '048bb92f3f33196d96a51b446c73805e208a5333': split setptop ethernet tcp buffer from wifi
| * Merge "split setptop ethernet tcp buffer from wifi"Elliott Hughes2013-11-211-11/+12
| |\
| | * split setptop ethernet tcp buffer from wifiJianzheng Zhou2013-11-151-11/+12
| | | | | | | | | | | | | | | Change-Id: I0582ec75fddb904ca14b9cbddf593ddbd4195c41 Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
* | | am 162c9a24: Merge "Switch MIPS over to <sys/user.h>."Elliott Hughes2013-11-201-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '162c9a247b2f62065c997c1085637f28e0fcde94': Switch MIPS over to <sys/user.h>.
| * | Merge "Switch MIPS over to <sys/user.h>."Elliott Hughes2013-11-201-1/+1
| |\ \
| | * | Switch MIPS over to <sys/user.h>.Elliott Hughes2013-11-201-1/+1
| |/ / | | | | | | | | | | | | Bug: 11559337 Change-Id: I47ce51ec2d45d9cfdfbb6cccce93a66b0f02d967
* | | am cbc32e9f: Merge "Support parsing RDNSS ND options from netlink."Lorenzo Colitti2013-11-192-5/+124
|\ \ \ | |/ / | | | | | | | | | * commit 'cbc32e9f7e95d9c35ec5d855a13fd9346e9f55bf': Support parsing RDNSS ND options from netlink.
| * | Merge "Support parsing RDNSS ND options from netlink."Lorenzo Colitti2013-11-202-5/+124
| |\ \
| | * | Support parsing RDNSS ND options from netlink.Lorenzo Colitti2013-11-202-5/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The RDNSS options (RFC 6106) used to configure DNS servers via router advertisements are passed from the kernel to userspace via RTM_NEWNDUSEROPT netlink messages. Add code to NetlinkEvent to parse them. Also fix a compiler warning and a couple of style issues. [Cherry-pick of b185e90dcc6ac111bff908edcc6d89fd6b37dc11] Bug: 9180552 Change-Id: I6c532c8f0ceef3afdc977a431a036df398013e1a
* | | | am 71dd5ba4: Merge "Switch back to subsystem "net" for netlink events."Lorenzo Colitti2013-11-192-4/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '71dd5ba4647fdecde0a44793f246fb0274159cbe': Switch back to subsystem "net" for netlink events.
| * | | Merge "Switch back to subsystem "net" for netlink events."Lorenzo Colitti2013-11-202-4/+9
| |\ \ \ | | |/ /
| | * | Switch back to subsystem "net" for netlink events.Lorenzo Colitti2013-11-202-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change to enable address tracking via netlink incorrectly changed the subsystem of rtnetlink events from "net" to "interface". This broke interface add/delete notifications, which come from the kernel with subsystem "net". Switch back to "net" and deal with address tracking via new action codes instead of a new subsystem. [Cherry-pick of f34861346d5c207912075fba9874090e4c947869] Bug: 10433320 Change-Id: Ibf30efb426949dfd02304cc1d9adb1c005a539a6
* | | | am a0b3fef0: Merge "Get rid of an infinite loop in NetlinkEvent.cpp."Lorenzo Colitti2013-11-191-8/+7
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'a0b3fef0b78e8c6ef38eac6bcd6da7db6a841522': Get rid of an infinite loop in NetlinkEvent.cpp.
| * | | Merge "Get rid of an infinite loop in NetlinkEvent.cpp."Lorenzo Colitti2013-11-201-8/+7
| |\ \ \ | | |/ /
| | * | Get rid of an infinite loop in NetlinkEvent.cpp.Lorenzo Colitti2013-11-201-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Cherry-pick of 3984276ce47c965ad02a522280a139e0a0c7e5cf] Bug: 10358527 Bug: 10263310 Bug: 10232006 Change-Id: I750e4bdf2000040adf214d6a772591d7bd25b350
* | | | am 8c099bc2: Merge "Parse IP address changes in NetlinkEvent."Lorenzo Colitti2013-11-192-1/+117
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '8c099bc206094dd229f4468b85c23b8639fb05ea': Parse IP address changes in NetlinkEvent.
| * | | Merge "Parse IP address changes in NetlinkEvent."Lorenzo Colitti2013-11-202-1/+117
| |\ \ \ | | |/ /
| | * | Parse IP address changes in NetlinkEvent.Lorenzo Colitti2013-11-202-1/+117
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds support for parsing RTM_NEWADDR and RTM_DELADDR netlink messages received on netd's netlink socket and formatting them them so NetlinkHandler can process them. Address changes are notified in subsystem "address". Interface changes, which used to be notified in subsystem "net", are now notified in subsystem "interface" to avoid confusion. [Cherry-pick of a4b4e9ad8e35ab424e61d76ebe6654445fc61e63] Bug: 10232006 Change-Id: I93a50e8de17014e118a42f5cc0eb90a0cbfa73cc
* | | am 3fa14a53: Merge "Remove x86 debuggerd dependencies on non-uapi headers ↵Elliott Hughes2013-11-141-14/+6
|\ \ \ | |/ / | | | | | | | | | | | | | | | and corkscrew." * commit '3fa14a53e70cd55df031646fe3735a6fde37deb8': Remove x86 debuggerd dependencies on non-uapi headers and corkscrew.
| * | Merge "Remove x86 debuggerd dependencies on non-uapi headers and corkscrew."Elliott Hughes2013-11-151-14/+6
| |\ \ | | |/ | |/|
| | * Remove x86 debuggerd dependencies on non-uapi headers and corkscrew.Elliott Hughes2013-11-141-14/+6
| |/ | | | | | | | | | | | | Also remove a hack that claims to be "just like ARM", but which was different from the ARM and MIPS behavior. Change-Id: I9b16da9a56430998ded27d304ce52c7cc8bfedfc
* | am 60e7d495: Merge "Fix libnetutils to build with clean uapi headers."Elliott Hughes2013-11-121-0/+5
|\ \ | |/ | | | | | | * commit '60e7d49557a4a330285f9bcd76f0dfae9c1855ae': Fix libnetutils to build with clean uapi headers.
| * Merge "Fix libnetutils to build with clean uapi headers."Elliott Hughes2013-11-121-0/+5
| |\
| | * Fix libnetutils to build with clean uapi headers.Elliott Hughes2013-11-121-0/+5
| | | | | | | | | | | | | | | | | | | | | (And old ones too.) Bug: 11559337 Change-Id: Ie61218055bbe07655a9d53c539aa47b85098e42c
* | | am 59644a6c: Merge "Fix nandread to build with old or uapi headers."Elliott Hughes2013-11-111-2/+6
|\ \ \ | |/ / | | | | | | | | | * commit '59644a6c7182db6caf53dc61f448f2c68ff569be': Fix nandread to build with old or uapi headers.
| * | Merge "Fix nandread to build with old or uapi headers."Elliott Hughes2013-11-121-2/+6
| |\ \ | | |/ | |/|
| | * Fix nandread to build with old or uapi headers.Elliott Hughes2013-11-111-2/+6
| |/ | | | | | | | | Bug: 11559337 Change-Id: I9795a16649dafdfe3df150170265157170cd5a79
* | am e6279294: Merge "Revert "Revert enabling libunwind.""Christopher Ferris2013-11-071-1/+1
|\ \ | |/ | | | | | | * commit 'e627929490dfb92ab51ec6feb259d793a4a9f394': Revert "Revert enabling libunwind."
| * Merge "Revert "Revert enabling libunwind.""Christopher Ferris2013-11-081-1/+1
| |\
| | * Revert "Revert enabling libunwind."Christopher Ferris2013-11-081-1/+1
| | | | | | | | | | | | | | | | | | This reverts commit db2309e3d104e47088135a7f1bb89ac853657838. Change-Id: I1626442f029473066ce20921667a406f1a1ea865
* | | am 62ea993a: Merge "Revert enabling libunwind."Elliott Hughes2013-11-071-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '62ea993a6997701dba7735ca4a4af6fc6cabac2c': Revert enabling libunwind.
| * | Merge "Revert enabling libunwind."Elliott Hughes2013-11-071-1/+1
| |\ \ | | |/
| | * Revert enabling libunwind.Christopher Ferris2013-11-071-1/+1
| | | | | | | | | | | | | | | | | | It appears that some branches might not have libunwind set up properly. Change-Id: Ia72889e115bc2791c7a9e67563c5f4a62197cafd
* | | am 30296f28: Merge "Let external/mksh install directly into /system/bin/sh."Elliott Hughes2013-11-071-14/+0
|\ \ \ | |/ / | | | | | | | | | * commit '30296f2801ee692a01c3a4698f50ca01fa238fd1': Let external/mksh install directly into /system/bin/sh.
| * | Merge "Let external/mksh install directly into /system/bin/sh."Elliott Hughes2013-11-071-14/+0
| |\ \ | | |/ | |/|
| | * Let external/mksh install directly into /system/bin/sh.Elliott Hughes2013-11-051-14/+0
| | | | | | | | | | | | Change-Id: I3ac60af2b5c6bba98c33cb63952eb4d35676d73f
* | | am 351b0123: Merge "Enable libunwind on arm platforms."Christopher Ferris2013-11-071-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '351b0123084570f8274ad3de44d515754c4b3add': Enable libunwind on arm platforms.
| * | Merge "Enable libunwind on arm platforms."Christopher Ferris2013-11-071-1/+1
| |\ \
| | * | Enable libunwind on arm platforms.Christopher Ferris2013-11-061-1/+1
| | | | | | | | | | | | | | | | | | | | Bug: 8410085 Change-Id: I8a645ec0e04b38fc186bbc0f0cc597e31b05cc55
* | | | am d6f9be1b: Merge "Fix include files in backtrace.h."Christopher Ferris2013-11-061-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'd6f9be1b9a2fc5880b0bcbb0fa47267a14fdc734': Fix include files in backtrace.h.
| * | | Merge "Fix include files in backtrace.h."Christopher Ferris2013-11-071-2/+2
| |\ \ \ | | |/ / | |/| |
| | * | Fix include files in backtrace.h.Christopher Ferris2013-11-061-2/+2
| |/ / | | | | | | | | | | | | | | | (cherry picked from commit 08932582226456b8789b52c28462e2224dfcc2e4) Change-Id: I37a78a9472b94ae84a84d871bfa9a070ff882699
* | | am a2d1469c: Merge "Use new defines in test code."Christopher Ferris2013-11-052-17/+15
|\ \ \ | |/ / | | | | | | | | | * commit 'a2d1469c773d809261d830d2f3cb3f6a7b6cdade': Use new defines in test code.
| * | Merge "Use new defines in test code."Christopher Ferris2013-11-052-17/+15
| |\ \
generated by cgit v1.1 at 2024-12-24 01:24:54 +0000