Commit graph

8320 commits

Author SHA1 Message Date
Elliott Hughes
830a8641bb am a8d0c4a2: Merge "Move host \'get-state\' service up so that it works."
* commit 'a8d0c4a2b8f99dd3dba9d726bdecde98d350da50':
  Move host 'get-state' service up so that it works.
2014-08-06 01:15:17 +00:00
Elliott Hughes
af2e6e1fba am 93266ed1: Merge changes I2998e40a,I03eacfa1
* commit '93266ed1f71a88af5ce5010235dfb9afbe43b289':
  Partially revert argument escaping.
  Uniformly escape shell arguments.
2014-08-05 22:58:34 +00:00
Elliott Hughes
e07a6e6337 am 6d9a5ac3: Merge "[MIPSR6] Skip pixelflinger, memset assembler code on mips32r6"
* commit '6d9a5ac394ba7bd813921812988a23d8e9b96ee1':
  [MIPSR6] Skip pixelflinger, memset assembler code on mips32r6
2014-08-05 18:34:46 +00:00
Elliott Hughes
6d9a5ac394 Merge "[MIPSR6] Skip pixelflinger, memset assembler code on mips32r6" 2014-08-05 17:41:26 +00:00
Brian Carlstrom
2ea89b631d am 936a236b: Merge "Add uncached argument to BacktraceMap::Create on darwin"
* commit '936a236b9e00100c915cce7e2fea8f553f491c7e':
  Add uncached argument to BacktraceMap::Create on darwin
2014-08-05 07:22:57 +00:00
Christopher Ferris
7d3d5229c1 am 1f5af3c2: Merge "Allow getting an uncached process map."
* commit '1f5af3c26c0511a8aa1f5657a85a01c106940d74':
  Allow getting an uncached process map.
2014-08-05 02:59:46 +00:00
Brian Carlstrom
936a236b9e Merge "Add uncached argument to BacktraceMap::Create on darwin" 2014-08-05 00:42:16 +00:00
Brian Carlstrom
b978a329ef Add uncached argument to BacktraceMap::Create on darwin
Change-Id: I247a98fc3b98879a0c34a975f9914ccec95d1a04
2014-08-05 00:15:49 -07:00
Elliott Hughes
93266ed1f7 Merge changes I2998e40a,I03eacfa1
* changes:
  Partially revert argument escaping.
  Uniformly escape shell arguments.
2014-08-05 00:35:38 +00:00
Jeff Sharkey
0cc642c82d Partially revert argument escaping.
Commands chained with && need to be passed through literally instead
of always being quoted.

(cherry-pick of 7c460351f53cb683097fe4071b9ec1e4cd7cdf82.)

Bug: 15479704
Change-Id: I2998e40a92a3bfd092098cd526403b469c86c9a6
2014-08-05 22:55:39 +00:00
Jeff Sharkey
dcd2f0ef2f Uniformly escape shell arguments.
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
2014-08-05 22:54:35 +00:00
Christopher Ferris
1f5af3c26c Merge "Allow getting an uncached process map." 2014-08-05 00:35:38 +00:00
Christopher Ferris
dda47b7868 Allow getting an uncached process map.
(cherry picked from commit f02593b0e6)

Change-Id: I2012bf2dc553ebc663345b9eac6d794e80df9c00
2014-08-04 19:21:23 -07:00
Elliott Hughes
a8d0c4a2b8 Merge "Move host 'get-state' service up so that it works." 2014-08-05 00:30:25 +00:00
Duane Sand
734f50c2fe [MIPSR6] Skip pixelflinger, memset assembler code on mips32r6
Temporarily use generic C-coded libpixelflinger & memset on mips32r6.

Change-Id: I629b11ba955eaba323cba1df96c39f75f4d24d62
2014-07-31 16:21:16 -07:00
Elliott Hughes
33a5575a58 am 39a8ade7: Merge "Fix sdcard truncates."
* commit '39a8ade7eebc945a112c10ba3331bd9a0934dbec':
  Fix sdcard truncates.
2014-07-31 19:36:40 +00:00
Dmitriy Ivanov
52b59127d8 am e7ec28bb: Merge "Exclude bionic private headers from include path"
* commit 'e7ec28bba7bb8573a7719f38b423b16b8d7c07da':
  Exclude bionic private headers from include path
2014-07-31 17:40:45 +00:00
Elliott Hughes
39a8ade7ee Merge "Fix sdcard truncates." 2014-07-30 23:37:06 +00:00
Elliott Hughes
853574ddc7 Fix sdcard truncates.
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
2014-07-31 12:20:14 -07:00
Mark Salyzyn
1d497f8a92 am cddc97cb: Merge "debuggerd: tombstone: suppress logger request for logd process"
* commit 'cddc97cb3a927d179a42e0fec77f0d267fcd74d1':
  debuggerd: tombstone: suppress logger request for logd process
2014-07-29 23:20:31 +00:00
Mark Salyzyn
cddc97cb3a Merge "debuggerd: tombstone: suppress logger request for logd process" 2014-07-29 22:52:28 +00:00
Elliott Hughes
ec531e5cdd am 47a12389: Merge "Fix adb "ptsname is not thread-safe; use ptsname_r instead" build break."
* commit '47a123895b11702e25ea217860ad173434ebfa6c':
  Fix adb "ptsname is not thread-safe; use ptsname_r instead" build break.
2014-07-29 18:36:33 +00:00
Elliott Hughes
3617bdf3ef am f6304733: Merge "Fix "ptsname is not thread-safe; use ptsname_r instead" build break."
* commit 'f6304733878628b6a003a4ea3588b9fbb5943ce5':
  Fix "ptsname is not thread-safe; use ptsname_r instead" build break.
2014-07-29 18:12:14 +00:00
Dmitriy Ivanov
e7ec28bba7 Merge "Exclude bionic private headers from include path" 2014-07-29 17:36:25 +00:00
Dmitriy Ivanov
9516139c03 Exclude bionic private headers from include path
Change-Id: I8b1269a739a690af91c63fa0f7f8f01d2d43bb97
2014-07-31 10:21:00 -07:00
Elliott Hughes
f630473387 Merge "Fix "ptsname is not thread-safe; use ptsname_r instead" build break." 2014-07-28 22:45:44 +00:00
Elliott Hughes
84cfd1092d Fix "ptsname is not thread-safe; use ptsname_r instead" build break.
Change-Id: I8fdca8e85056e99e943bdcf93a48574d76addcdc
2014-07-29 11:06:53 -07:00
Mark Salyzyn
45ae446cab debuggerd: tombstone: suppress logger request for logd process
Change-Id: I619880342ee6febd1a6cc98d2a4f536120efc1c8
2014-07-28 15:16:05 -07:00
Simon Ye
dc22c3c7a8 Move host 'get-state' service up so that it works.
Due to previous bad merge, the get-state service was moved out of the
ADB_HOST #ifdef block.

Change-Id: Id4b72a051ff04104659925e63a02eb340db2f807
2014-07-28 11:44:46 -07:00
Elliott Hughes
95ec9ae2c6 am bce3c0c7: Merge "Clarify init\'s write command."
* commit 'bce3c0c7bd55e26a5ad4da5257a9621756e15f10':
  Clarify init's write command.
2014-07-25 23:01:06 +00:00
Elliott Hughes
47a123895b Merge "Fix adb "ptsname is not thread-safe; use ptsname_r instead" build break." 2014-07-25 21:16:27 +00:00
Elliott Hughes
d235288553 Fix adb "ptsname is not thread-safe; use ptsname_r instead" build break.
Change-Id: I633dc4d6d421862473e7267cc0d2c1b0933392e0
2014-07-29 11:32:16 -07:00
Elliott Hughes
70b5cb7948 am c9343cfe: Merge "Refresh toolbox."
* commit 'c9343cfe404cd80fe7f1bf15184845d686b19794':
  Refresh toolbox.
2014-07-25 18:32:30 +00:00
Nick Kralevich
1a423b2ee7 am 66083ae8: Merge "sdcard: ensure installd fs upgrade has completed"
* commit '66083ae834374074047f0eff41e80999660d4af1':
  sdcard: ensure installd fs upgrade has completed
2014-07-25 18:32:29 +00:00
Neil Fuller
7a6705b886 am e91d9d80: Merge "Prevent the accidental closure of fd[0] for missing zip files."
* commit 'e91d9d80d18eca571f00c82b54cd44956299cbda':
  Prevent the accidental closure of fd[0] for missing zip files.
2014-07-25 15:32:26 +00:00
Colin Cross
edf41f981c am 8d9d362b: Merge "adb: Add USB vendor ID for SONIM TECHNOLOGIES, INC."
* commit '8d9d362b0cc999b11db2495c657a6b268705467a':
  adb: Add USB vendor ID for SONIM TECHNOLOGIES, INC.
2014-07-25 03:35:51 +00:00
Tim Murray
3a5f3db2aa am c894ced1: Merge "Fix fastboot for Darwin."
* commit 'c894ced1837117aa3e2dfae702ef51c35b5d74d9':
  Fix fastboot for Darwin.
2014-07-25 02:33:43 +00:00
Tim Murray
6ebaf311a7 am 721f189a: Merge "fix adb build on Darwin"
* commit '721f189a0571ab51388c8a223f343f3da78f28df':
  fix adb build on Darwin
2014-07-25 02:20:30 +00:00
Elliott Hughes
6a223baf95 am 52508091: Merge "Silence healthd warnings."
* commit '525080910efd55df0d562980b6139c0efcc8a47c':
  Silence healthd warnings.
2014-07-25 02:20:29 +00:00
Tim Murray
f2879ef614 am 6698ebf9: Merge "Fix Darwin build caused by -Wunused-parameter."
* commit '6698ebf92857b7a390264b36603c57ae639b43a2':
  Fix Darwin build caused by -Wunused-parameter.
2014-07-25 02:20:28 +00:00
Colin Cross
8d9d362b0c Merge "adb: Add USB vendor ID for SONIM TECHNOLOGIES, INC." 2014-07-25 00:30:15 +00:00
DanielMo
43222b3f0a adb: Add USB vendor ID for SONIM TECHNOLOGIES, INC.
Change-Id: Id66997709fec55b1efd389abf2efa644b9a8ccf4
Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
2014-07-25 11:17:55 +08:00
Elliott Hughes
d8c3038b50 am d629c789: Merge "Remove <cutils/tztime.h>."
* commit 'd629c7892fca6a085ad1aebc9d8ac74092f7a2a5':
  Remove <cutils/tztime.h>.
2014-07-24 23:18:34 +00:00
Tim Murray
c894ced183 Merge "Fix fastboot for Darwin." 2014-07-24 22:43:23 +00:00
Tim Murray
bd87944805 Fix fastboot for Darwin.
bug 16172793

Change-Id: Ib58446effc13a6e465d176da141b025d36841b8f
2014-07-24 19:27:37 -07:00
Tim Murray
1efcdeffe5 fix adb build on Darwin
bug 16172793

Change-Id: Ia34b7148afc4c909f29037df91c04d6fd29a731e
2014-07-24 18:33:12 -07:00
Mark Salyzyn
914e36b919 am 74ee1c05: Merge "logcat: test: logrotate flags"
* commit '74ee1c05d4f942d5cf45c9fcbb6f0d6444fb1db6':
  logcat: test: logrotate flags
2014-07-24 22:19:11 +00:00
Tim Murray
6698ebf928 Merge "Fix Darwin build caused by -Wunused-parameter." 2014-07-24 22:07:52 +00:00
Tim Murray
b37009fa77 Fix Darwin build caused by -Wunused-parameter.
bug 16172793

Change-Id: I1d0514c00085cb5d18ebdd064e96885d6eaa1e59
2014-07-24 17:22:09 -07:00
Tim Murray
83ddddaaba am 4795ce06: Merge "Update makefiles for host clang."
* commit '4795ce066024c7ab235cb0c6bb229b0b6d9e5878':
  Update makefiles for host clang.
2014-07-24 21:04:24 +00:00