summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Move native bridge library in system/coreCalin Juravle2014-08-123-0/+258
| | | | | | Bug: 16884833 Change-Id: I73aab8e212860ba5aee9444d801806d3da326a41
* Merge "Move host 'get-state' service up so that it works."Elliott Hughes2014-08-051-5/+5
|\
| * Move host 'get-state' service up so that it works.Simon Ye2014-07-281-5/+5
| | | | | | | | | | | | | | Due to previous bad merge, the get-state service was moved out of the ADB_HOST #ifdef block. Change-Id: Id4b72a051ff04104659925e63a02eb340db2f807
* | Merge changes I2998e40a,I03eacfa1Elliott Hughes2014-08-051-36/+28
|\ \ | | | | | | | | | | | | | | | * changes: Partially revert argument escaping. Uniformly escape shell arguments.
| * | Partially revert argument escaping.Jeff Sharkey2014-08-051-13/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | Commands chained with && need to be passed through literally instead of always being quoted. (cherry-pick of 7c460351f53cb683097fe4071b9ec1e4cd7cdf82.) Bug: 15479704 Change-Id: I2998e40a92a3bfd092098cd526403b469c86c9a6
| * | Uniformly escape shell arguments.Jeff Sharkey2014-08-051-40/+25
|/ / | | | | | | | | | | | | | | | | | | Arguments with embedded spaces need to be wrapped in quotes, which changes the overall escaping strategy. Instead of mixing the two strategies, just always wrap arguments in quotes. (cherry-pick of fd546e8c35341b518873eb4f883afbed92e947af.) Bug: 15479704 Change-Id: I03eacfa1bd6c220d4ec6617b825ebb0c43c7221e
* | Merge "[MIPSR6] Skip pixelflinger, memset assembler code on mips32r6"Elliott Hughes2014-08-055-11/+23
|\ \
| * | [MIPSR6] Skip pixelflinger, memset assembler code on mips32r6Duane Sand2014-07-315-11/+23
| | | | | | | | | | | | | | | | | | Temporarily use generic C-coded libpixelflinger & memset on mips32r6. Change-Id: I629b11ba955eaba323cba1df96c39f75f4d24d62
* | | Merge "Add uncached argument to BacktraceMap::Create on darwin"Brian Carlstrom2014-08-051-1/+1
|\ \ \
| * | | Add uncached argument to BacktraceMap::Create on darwinBrian Carlstrom2014-08-051-1/+1
|/ / / | | | | | | | | | Change-Id: I247a98fc3b98879a0c34a975f9914ccec95d1a04
* | | Merge "Allow getting an uncached process map."Christopher Ferris2014-08-052-3/+10
|\ \ \
| * | | Allow getting an uncached process map.Christopher Ferris2014-08-042-3/+10
|/ / / | | | | | | | | | | | | | | | (cherry picked from commit f02593b0e61f8108449770094caa7bb39a646ec1) Change-Id: I2012bf2dc553ebc663345b9eac6d794e80df9c00
* | | Merge "Fix sdcard truncates."Elliott Hughes2014-07-301-1/+1
|\ \ \
| * | | Fix sdcard truncates.Elliott Hughes2014-07-311-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | Use truncate64 instead of truncate so we don't truncate (ho ho) the offset. (cherrypick of 4568565e85bf2e1ea11b2e09d72e244088c05dbc.) Bug: https://code.google.com/p/android/issues/detail?id=74039 Change-Id: I63711ccd299e3ebc475563b1999817d1919571ab
* | | Merge "Exclude bionic private headers from include path"Dmitriy Ivanov2014-07-292-2/+2
|\ \ \ | |/ / |/| |
| * | Exclude bionic private headers from include pathDmitriy Ivanov2014-07-312-2/+2
|/ / | | | | | | Change-Id: I8b1269a739a690af91c63fa0f7f8f01d2d43bb97
* | Merge "debuggerd: tombstone: suppress logger request for logd process"Mark Salyzyn2014-07-292-1/+13
|\ \
| * | debuggerd: tombstone: suppress logger request for logd processMark Salyzyn2014-07-282-1/+13
| | | | | | | | | | | | Change-Id: I619880342ee6febd1a6cc98d2a4f536120efc1c8
* | | Merge "Fix adb "ptsname is not thread-safe; use ptsname_r instead" build break."Elliott Hughes2014-07-251-3/+2
|\ \ \
| * | | Fix adb "ptsname is not thread-safe; use ptsname_r instead" build break.Elliott Hughes2014-07-291-3/+2
|/ / / | | | | | | | | | Change-Id: I633dc4d6d421862473e7267cc0d2c1b0933392e0
* | | Merge "Fix "ptsname is not thread-safe; use ptsname_r instead" build break."Elliott Hughes2014-07-281-2/+2
|\ \ \ | |/ / |/| |
| * | Fix "ptsname is not thread-safe; use ptsname_r instead" build break.Elliott Hughes2014-07-291-2/+2
|/ / | | | | | | Change-Id: I8fdca8e85056e99e943bdcf93a48574d76addcdc
* | Merge "Clarify init's write command."Elliott Hughes2014-07-241-3/+3
|\ \
| * | Clarify init's write command.Elliott Hughes2014-07-251-3/+3
| | | | | | | | | | | | | | | Bug: https://code.google.com/p/android/issues/detail?id=73996 Change-Id: I4f8d3927d17a4021a2436c2859aa732479c5a118
* | | Merge "Refresh toolbox."Elliott Hughes2014-07-2350-2089/+5901
|\ \ \
| * | | Refresh toolbox.Elliott Hughes2014-07-2450-2089/+5901
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use more upstream NetBSD, and update those things that were already NetBSD. Note that unlike bionic, the upstream-netbsd directory isn't pristine; we have changes marked by __ANDROID__. Bug: 16493461 Change-Id: I99762bfe02caa0945ea4a184670888a4b5435a1d
* | | | Merge "sdcard: ensure installd fs upgrade has completed"Nick Kralevich2014-07-241-0/+6
|\ \ \ \
| * | | | sdcard: ensure installd fs upgrade has completedNick Kralevich2014-07-251-0/+6
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before running the sdcard daemon, make sure that installd has completed all upgrades to /data that it needs to complete. This avoids race conditions between installd and the sdcard daemon. Maybe fixes bug 16329437. (cherrypicked from commit 8d28fa71fce6a5623488614250970ce78551a924) Bug: 16329437 Change-Id: I5e164f08009c1036469f8734ec07cbae9c5e262b
* | | | Merge "Prevent the accidental closure of fd[0] for missing zip files."Neil Fuller2014-07-232-22/+33
|\ \ \ \
| * | | | Prevent the accidental closure of fd[0] for missing zip files.Neil Fuller2014-07-252-22/+33
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16530747 Change-Id: I3593f2bc4d56a2f91252ea795c90ce3c78e1ec06
* | | | | Merge "adb: Add USB vendor ID for SONIM TECHNOLOGIES, INC."Colin Cross2014-07-251-0/+3
|\ \ \ \ \
| * | | | | adb: Add USB vendor ID for SONIM TECHNOLOGIES, INC.DanielMo2014-07-251-0/+3
|/ / / / / | | | | | | | | | | | | | | | | | | | | Change-Id: Id66997709fec55b1efd389abf2efa644b9a8ccf4 Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
* | | | | Merge "Fix fastboot for Darwin."Tim Murray2014-07-241-0/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix fastboot for Darwin.Tim Murray2014-07-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug 16172793 Change-Id: Ib58446effc13a6e465d176da141b025d36841b8f
* | | | | Merge "fix adb build on Darwin"Tim Murray2014-07-241-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | fix adb build on DarwinTim Murray2014-07-241-0/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | bug 16172793 Change-Id: Ia34b7148afc4c909f29037df91c04d6fd29a731e
* | | | Merge "Silence healthd warnings."Elliott Hughes2014-07-231-1/+1
|\ \ \ \
| * | | | Silence healthd warnings.Elliott Hughes2014-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I339cf62ce93cb268e00ba26f1c310d0586899476
* | | | | Merge "Fix Darwin build caused by -Wunused-parameter."Tim Murray2014-07-241-0/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix Darwin build caused by -Wunused-parameter.Tim Murray2014-07-241-0/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | bug 16172793 Change-Id: I1d0514c00085cb5d18ebdd064e96885d6eaa1e59
* | | | Merge "Remove <cutils/tztime.h>."Elliott Hughes2014-07-231-24/+0
|\ \ \ \
| * | | | Remove <cutils/tztime.h>.Elliott Hughes2014-07-241-24/+0
| | |/ / | |/| | | | | | | | | | Change-Id: I043c6686361bda9e85b82408511bf241a42b9229
* | | | Merge "logcat: test: logrotate flags"Mark Salyzyn2014-07-231-5/+48
|\ \ \ \
| * | | | logcat: test: logrotate flagsMark Salyzyn2014-07-241-5/+48
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | - test -f -n and -r flags - fix issue with parse error for sizes in bytes (no multiplier) Bug: 16147190 Change-Id: Iadf2fd903d5e881d02f1d2b491441cc8090ee1c9
* | | | Merge "Update makefiles for host clang."Tim Murray2014-07-242-1/+3
|\ \ \ \
| * | | | Update makefiles for host clang.Tim Murray2014-07-242-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug 16172793 Change-Id: If7484c5dbcccce7d925bec97bff0a3e4c30e9434
* | | | | Merge "Add SELinux MAC to debuggerd."Nick Kralevich2014-07-231-0/+56
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add SELinux MAC to debuggerd.Stephen Smalley2014-07-241-0/+56
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | debuggerd allows uid-0 processes to dump tombstones or backtraces of any process, and uid-system processes to dump backtraces of any processes. Restrict these operations via SELinux based on the client context, the target process context, and the action. Depends on I8e120d319512ff207ed22ed87cde4e0432a13dda for the corresponding policy definitions. Change-Id: Ib317564e54e07cc21f259e75124b762ad17c6e16 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | | | Merge "Correction to TRACE format strings"Elliott Hughes2014-07-231-16/+17
|\ \ \ \ | |/ / / |/| | |
| * | | Correction to TRACE format stringsMarcus Oakland2014-07-241-16/+17
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | When built with "#define FUSE_TRACE 1" numerous TRACE statements failed to compile because of mismatches between format strings and types (uint64_t and size_t). These have been corrected by using the format strings from the inttype.h header file, or %zu. Change-Id: I36cd6f8da0790f1218d7dbaaa5b3bbfa4df7fdee Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
generated by cgit v1.1 at 2025-01-11 02:41:10 +0000