summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | Merge "Force alignment of data buffer used to process netlink messages"Elliott Hughes2013-12-141-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Force alignment of data buffer used to process netlink messagesChris Dearman2013-10-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids any overhead associated with accessing unaligned data while processing netlink messages. Change-Id: I1ea13051816ef46b6627594121d98cda130ac609
* | | | | | | | | Merge "Fix ExtractEntryToFile."Narayan Kamath2013-12-133-5/+57
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix ExtractEntryToFile.Narayan Kamath2013-12-133-5/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We would always write uncompressed data at offset 0 instead of the current filedescriptor offset. Also adds a unit-test & a clarifying comment on the API. Change-Id: If44757e96dde504ce63d81b4dec7115fc6f6d5fb
* | | | | | | | | | Merge "libion: Use %zu for size_t"Elliott Hughes2013-12-131-2/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | libion: Use %zu for size_tAshok Bhat2013-12-101-2/+2
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If92fc31ab676a569530c21e655a1b5b451f5c5e5 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | | | | | | | Merge "Pixelflinger: Fix issue of pointers being stored in ints"Elliott Hughes2013-12-124-8/+8
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Pixelflinger: Fix issue of pointers being stored in intsAshok Bhat2013-12-124-8/+8
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pixelflinger's code makes assumptions, at certain places, that pointers can be stored as ints. This patch makes use of uintptr_t wherever pointers are stored as int or cast to int. Change-Id: Ie76f425cbc82ac038a747f77a95bd31774f4a8e8 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | | | | | | Merge "Get rid of some log spam."Narayan Kamath2013-12-121-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Get rid of some log spam.Narayan Kamath2013-12-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need a warning if an entry isn't found in a zip file. It can happen as part of normal operation. Change-Id: I86c132a040371f36f0dd981b49c02b3173821439
* | | | | | | | Merge "Minor cleanups."Nick Kralevich2013-12-111-3/+3
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Minor cleanups.Nick Kralevich2013-11-271-3/+3
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use ssize_t for handling the result of a readlink call. Fix the following compiler warning: system/core/toolbox/ls.c: In function 'listfile_maclabel': system/core/toolbox/ls.c:238:68: warning: unused parameter 'flags' [-Wunused-parameter] static int listfile_maclabel(const char *path, struct stat *s, int flags) Change-Id: Idd65f3349fb9dfb6f7a374c81f72d3169af33505
* | | | | | | Merge "Use FileMap from libcutil instead of rolling our own."Narayan Kamath2013-12-112-75/+43
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Use FileMap from libcutil instead of rolling our own.Narayan Kamath2013-12-112-75/+43
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds windows support as a side effect. Change-Id: I912c1f980f284d01d4f3936291999646ddf6250a
* | | | | | Merge "Add unit tests for libziparchive."Narayan Kamath2013-12-104-15/+155
|\ \ \ \ \ \
| * | | | | | Add unit tests for libziparchive.Narayan Kamath2013-12-104-15/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add a build rule for host tests - Add basic tests for Find / Iterate and Extract for both deflated & stored entries. - Fix an off by one error that the test uncovered. Change-Id: If72009b1ea9791d5a265829f05c32ffe1c2752c4
* | | | | | | Merge "Fix return code for ended iteration."Narayan Kamath2013-12-101-6/+6
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | |
| * | | | | Fix return code for ended iteration.Narayan Kamath2013-12-091-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The API promises a return code of -1 for an ended iteration and lower negative values for errors. Change-Id: I688a1ee2efad1bdfc6959cf27e49c0426ebf27f8
* | | | | | Merge "Log a warning on services that lack SELinux domains."Nick Kralevich2013-12-091-0/+3
|\ \ \ \ \ \
| * | | | | | Log a warning on services that lack SELinux domains.Stephen Smalley2013-12-091-0/+3
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sample output on flo: <3>[ 7.270568] init: Warning! Service irsc_util needs a SELinux domain defined; please fix! <3>[ 8.290832] init: Warning! Service bootanim needs a SELinux domain defined; please fix! Change-Id: If5514b188517917d58ee81c446af563b0443be45 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | | | | | Merge "Do not change ownership on /sys/fs/selinux/enforce."Nick Kralevich2013-12-091-3/+0
|\ \ \ \ \ \
| * | | | | | Do not change ownership on /sys/fs/selinux/enforce.Stephen Smalley2013-12-091-3/+0
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no longer any reason to permit system UID to set enforcing mode. Change-Id: Ie28beed1ca2b215c71f2847e2390cee1af1713c3 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | | | | | am ac3ab308: Merge "Fix Mac OS build for libziparchive."Narayan Kamath2013-12-061-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ac3ab308f657f70e2747734d5ff2158aa943b25e': Fix Mac OS build for libziparchive.
| * \ \ \ \ \ Merge "Fix Mac OS build for libziparchive."Narayan Kamath2013-12-061-0/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Fix Mac OS build for libziparchive.Narayan Kamath2013-12-061-0/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BSD off_t are implicitly 64 bit so the platform doesn't define off64_t. Change-Id: I51cbe94ead01d2d6bc7c5010d9472487bee7c2d3
* | | | | | am a2125077: Merge "Unify zipfile implementations : Step 1."Narayan Kamath2013-12-064-0/+1350
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'a2125077e104941f797f93fbe6bfad22ef60a1d8': Unify zipfile implementations : Step 1.
| * | | | | Merge "Unify zipfile implementations : Step 1."Narayan Kamath2013-12-064-0/+1350
| |\ \ \ \ \
| | * | | | | Unify zipfile implementations : Step 1.Narayan Kamath2013-12-044-0/+1350
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract zip file processing logic from libdvm into a standalone library. This library is a stricter than the libdvm library in several ways: - Duplicate zip entry names are now disallowed. Files with such entries will fail to parse. - We now verify CD file size information with the individual file header information. (This was pointed out as a deficiency of this implementation in past discussions.) - We also add support for crc checking, which means we might need to parse the optional data descriptor footer (if one exists). We also provide an API for iterating over the entries of a zip file. This library is optimized for two use cases : - Lookup for a single entry in the file, with the intention of processing or extracting the data associated with that entry - Iterating over all entries in a file *and* processing / extracting their data. Change-Id: Ia87de6184ef753cc470b0af755c47a4f92ac8198
* | | | | | Merge commit '252d9030cd4b2e3e6cf13fa33f328eccedb5e26c' into HEADThe Android Open Source Project2013-12-0511-50/+716
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | am bf8e9342: am 3fa14a53: Merge "Remove x86 debuggerd dependencies on ↵Elliott Hughes2013-11-141-14/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | non-uapi headers and corkscrew." * commit 'bf8e9342daa8b148e6d94d98122c9bc2a429b04f': Remove x86 debuggerd dependencies on non-uapi headers and corkscrew.
| * \ \ \ \ \ am d97a34af: am 60e7d495: Merge "Fix libnetutils to build with clean uapi ↵Elliott Hughes2013-11-121-0/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | headers." * commit 'd97a34af49f6beafc21d5f459ea62b499544f9f3': Fix libnetutils to build with clean uapi headers.
| * \ \ \ \ \ \ am e8c6d15b: am 59644a6c: Merge "Fix nandread to build with old or uapi ↵Elliott Hughes2013-11-111-2/+6
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | headers." * commit 'e8c6d15b1892ffd09dae8ac7922854140a11130d': Fix nandread to build with old or uapi headers.
| * \ \ \ \ \ \ \ am d36bfc30: am e6279294: Merge "Revert "Revert enabling libunwind.""Christopher Ferris2013-11-071-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd36bfc30ae5fa86b4c3fd8248e5ee16f479250b6': Revert "Revert enabling libunwind."
| * \ \ \ \ \ \ \ \ am 4ae94541: am 62ea993a: Merge "Revert enabling libunwind."Elliott Hughes2013-11-071-1/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4ae94541b82dde787b0e2c46f1a4f2524572c1c4': Revert enabling libunwind.
| * \ \ \ \ \ \ \ \ \ am fde641ee: am 30296f28: Merge "Let external/mksh install directly into ↵Elliott Hughes2013-11-071-14/+0
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /system/bin/sh." * commit 'fde641ee24b7a0a5d1fb6e2532153f1bb8504aea': Let external/mksh install directly into /system/bin/sh.
| * \ \ \ \ \ \ \ \ \ \ am 11d04d04: am 351b0123: Merge "Enable libunwind on arm platforms."Christopher Ferris2013-11-071-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '11d04d04418503e2381cf4479a105efaf7c13992': Enable libunwind on arm platforms.
| * \ \ \ \ \ \ \ \ \ \ \ am 5e860ce2: am d6f9be1b: Merge "Fix include files in backtrace.h."Christopher Ferris2013-11-061-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5e860ce246b9235debc6a04325c7c1983c2b277e': Fix include files in backtrace.h.
| * \ \ \ \ \ \ \ \ \ \ \ \ am adbb3352: am a2d1469c: Merge "Use new defines in test code."Christopher Ferris2013-11-052-17/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'adbb3352e9ce98e2012fa136198daa8342bdac00': Use new defines in test code.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am 1e1bae1b: am c2945850: Merge "Add some clarifying defines."Christopher Ferris2013-11-052-3/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1e1bae1b0fc750f60ef9a2531850bbcf27ba6610': Add some clarifying defines.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f4b3b73e: am c8626ba4: Merge "Dispose of ash."Elliott Hughes2013-11-0585-25738/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f4b3b73e95422afe79d5c5e7d28b0fcdfeaa7e88': Dispose of ash.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d5a7c371: am 408b3acf: Merge "Add corkscrew support for finding static ↵Christopher Ferris2013-11-051-7/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | symbols." * commit 'd5a7c371d22ea327be03bfa10944e5f0f2d51a24': Add corkscrew support for finding static symbols.
| * | | | | | | | | | | | | | | | | fix corruption in Vector<> when malloc faliedShuo Gao2013-10-301-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. When alloc or realloc failed in the function SharedBuffer::editResize, it would return a NULL pointer, then mStorage would update to be 1 by SharedBuffer::data() if no pointer check here, which is an obviously wrong address, and would cause corruption when used it e.g. in capacity(). So add the pointer check here for the return value of SharedBuffer::editResize, if it's NULL do not use it to update mStorage, to avoid the value of mStorage polluted. 2. when alloc or realloc falied in _grow & _shrink function, mStorage keep the original value, so mCount should not be updated here. Otherwise, mStorage might be 0 but mCount>0, so a corruption would happend when it try to delete items from the Vector since mCount>0. Change-Id: I7c3814e843c459834ca5eed392e8d63d1cb7d2d8 Signed-off-by: Shuo Gao <shuo.gao@intel.com> Signed-off-by: Jian Luo <jian.luo@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Author-tracking-BZ: 139626
| * | | | | | | | | | | | | | | | | am e65b7ea8: utils: Fix broken sdk build on windowsIgor Murashkin2013-10-302-0/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e65b7ea8801145626504c724c28aedd0e5038a28': utils: Fix broken sdk build on windows
| | * | | | | | | | | | | | | | | | | utils: Fix broken sdk build on windowsIgor Murashkin2013-10-302-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11324229 Change-Id: Ia50e79b5e2430faea77b0c98902e8e018fb9ceff
| * | | | | | | | | | | | | | | | | | am 81f2c3d2: utils: Fix broken buildIgor Murashkin2013-10-301-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '81f2c3d2117cfe7307ee6efbd82567bd02950965': utils: Fix broken build
| | * | | | | | | | | | | | | | | | | utils: Fix broken buildIgor Murashkin2013-10-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11324229 Change-Id: I7e4f514c5531e4c0c11bb0ba5d67e4dabbcd5792
| * | | | | | | | | | | | | | | | | | am b5c24e09: am 8c58086c: Merge "More libbacktrace fixes."Christopher Ferris2013-10-308-121/+117
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b5c24e096d34e0f096d574f2aa799cd2dc6fc7db': More libbacktrace fixes.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 1b84e0a3: Merge "utils: Add ProcessCallStack to collect stack traces for ↵Igor Murashkin2013-10-307-45/+681
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | all threads in a process" into klp-dev * commit '1b84e0a3145f1497fc2259608d8830f371526ece': utils: Add ProcessCallStack to collect stack traces for all threads in a process
| | * | | | | | | | | | | | | | | | | | Merge "utils: Add ProcessCallStack to collect stack traces for all threads ↵Igor Murashkin2013-10-307-45/+681
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in a process" into klp-dev
| | | * | | | | | | | | | | | | | | | | | utils: Add ProcessCallStack to collect stack traces for all threads in a processIgor Murashkin2013-10-257-45/+681
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Also add a Printer class (print lines to logcat, fd, or strings) Bug: 11324229 Change-Id: I78435ed49aa196a0efb45bf9b2d58b62c41737d3