Commit Graph

10481 Commits

Author SHA1 Message Date
Mark Salyzyn c113c5813e logd: persistent reader threads
Bug: 16822776
Change-Id: I5bea468a41089b51108880044f32e2b2df1278e7
2014-08-08 07:40:33 -07:00
Badhri Jagan Sridharan ef4087bf2b libusbhost: Fix IOCTL call during usb_request_cancel
USBDEVFS_DISCARDURB IOCTL call expects a pointer to the
the urb structure to be passed from userspace. LibusbHost
instead sends usbdevfs_urb**. Change this to usbdevfs_urb*.

Fixes Issue: https://code.google.com/p/android/issues/detail?id=74530

Change-Id: Ifb8a13857e1a9f62536f2a07c0965e9c419b7d4c
2014-08-07 14:58:31 -07:00
Piotr Jastrzebski 400e73720c Merge "Add EndIteration method to free memory allocated" 2014-08-07 18:51:06 +00:00
Piotr Jastrzebski 79c8b34f36 Add EndIteration method to free memory allocated
in StartIteration. This method should always be called when the
iteration is over to make sure that we don't leak memory.

Change-Id: I5205c754dfafbab9bb5f06003c3663d2ec4e8a35
2014-08-11 07:58:00 +01:00
Narayan Kamath 1fabc35cb5 Export the new system_server classpath.
bug: 16555230

Change-Id: I99d2d219b5bd6dc4807cb53e44dc5715cc0815b3
2014-08-07 15:32:07 +01:00
Badhri Jagan Sridharan 266685924a libusbhost: Fix IOCTL call during usb_request_cancel
USBDEVFS_DISCARDURB IOCTL call expects a pointer to the
the urb structure to be passed from userspace. LibusbHost
instead sends usbdevfs_urb**. Change this to usbdevfs_urb*.

Fixes Issue: https://code.google.com/p/android/issues/detail?id=74530

Change-Id: Ifb8a13857e1a9f62536f2a07c0965e9c419b7d4c
2014-08-07 01:13:31 +00:00
Elliott Hughes aab3b34cd7 am 4c818dc8: am 56b28f6b: Merge "RefBase: make Renamer destructor virtual"
* commit '4c818dc800d97e2fdee0337a0e9736099d90cc47':
  RefBase: make Renamer destructor virtual
2014-08-06 22:48:30 +00:00
Elliott Hughes 4c818dc800 am 56b28f6b: Merge "RefBase: make Renamer destructor virtual"
* commit '56b28f6b2c4722c75dbc7f041f36552221e51133':
  RefBase: make Renamer destructor virtual
2014-08-06 22:44:38 +00:00
Elliott Hughes 0fd33562d6 am 5d228392: am d24240fb: Merge "Fixed the pacing logic in bootchart data collection."
* commit '5d2283927a9527130cad15d33c1e2b360f4bd46f':
  Fixed the pacing logic in bootchart data collection.
2014-08-06 22:40:43 +00:00
Elliott Hughes 5d2283927a am d24240fb: Merge "Fixed the pacing logic in bootchart data collection."
* commit 'd24240fb4fea5b1b2776f6b7e5e632ef8d21e978':
  Fixed the pacing logic in bootchart data collection.
2014-08-06 22:37:46 +00:00
Eric Laurent c85cce96af am fb2343da: Merge "audio: add defines for audio HW sync source" into lmp-dev
* commit 'fb2343da60bdf56205a29ec11db5e3bdd87d9651':
  audio: add defines for audio HW sync source
2014-08-06 20:30:22 +00:00
Alexander Ivchenko a05c25af94 am 678bd2e8: Fix build of adb with gcc-4.9.
* commit '678bd2e8225ccebe678430d4095b7fc78253bcf8':
  Fix build of adb with gcc-4.9.
2014-08-06 18:09:19 +00:00
Elliott Hughes e772705a59 am 771f6f29: am 29c5a78f: Merge "Fix build of adb with gcc-4.9."
* commit '771f6f299f16704b251d6adb8fb185c8fb517d07':
  Fix build of adb with gcc-4.9.
2014-08-06 18:06:33 +00:00
Elliott Hughes 771f6f299f am 29c5a78f: Merge "Fix build of adb with gcc-4.9."
* commit '29c5a78fdc163f7d5e5e3a00729b8c37a89562f6':
  Fix build of adb with gcc-4.9.
2014-08-06 18:01:50 +00:00
Alexander Ivchenko 678bd2e822 Fix build of adb with gcc-4.9.
Without this patch we get:

system/core/adb/commandline.c:1629:16: error: array subscript is above
array bounds [-Werror=array-bounds]

Signed-off-by: Alexander Ivchenko <alexander.ivchenko@intel.com>

(cherry picked from commit 5372333885)

Change-Id: I920c1de933ce5ba0a0d57eb8a9b557325a767a2a
2014-08-06 10:59:53 -07:00
Eric Laurent fb2343da60 Merge "audio: add defines for audio HW sync source" into lmp-dev 2014-08-06 17:19:40 +00:00
Elliott Hughes d24240fb4f Merge "Fixed the pacing logic in bootchart data collection." 2014-08-06 17:15:22 +00:00
Brian Carlstrom 8a01917da1 am 46a8ffe8: Fix Windows adb build by avoiding "bool"
* commit '46a8ffe87f3cba070fb18a90e3c5c1f73468f99c':
  Fix Windows adb build by avoiding "bool"
2014-08-06 12:57:22 +00:00
Jeremy Compostella ecd28eff0a fastboot: add the support of the second stage image
The AOSP bootimage format allows the use of a second stage image
however the fastboot boot and flash:row commands do not allow the
"secondstage" optional argument.  This patch adds the support of this
argument for both commands.

Change-Id: I00403a95d7460a00233841ba0fe0e8a69d78c7b4
Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com>
2014-08-06 12:27:01 +02:00
Brian Carlstrom 46a8ffe87f Fix Windows adb build by avoiding "bool"
Change-Id: I9ca59e400c199d497a1a18d5e64c2cafe628097b
2014-08-05 22:51:18 -07:00
Jeff Sharkey 8c9b155ea1 am 43d65b69: Merge "Escape single quotes in arguments." into lmp-dev
* commit '43d65b6903249a409031b081bb6175b9ad3e5c2a':
  Escape single quotes in arguments.
2014-08-06 01:23:28 +00:00
Simon Ye fea59faa01 am d9c4b14b: Move host \'get-state\' service up so that it works.
* commit 'd9c4b14b44e93006efdffb059b769d46af509e2d':
  Move host 'get-state' service up so that it works.
2014-08-06 01:23:28 +00:00
Elliott Hughes 440df7b61f am 830a8641: am a8d0c4a2: Merge "Move host \'get-state\' service up so that it works."
* commit '830a8641bb960d208ad2a5b3bc3d9fb91bc31c2b':
  Move host 'get-state' service up so that it works.
2014-08-06 01:22:09 +00:00
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
Simon Ye d9c4b14b44 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.

(cherry picked from commit dc22c3c7a8)

Change-Id: I08465e7c666104a4c2d15eadef8a4d4be7f91456
2014-08-05 17:23:35 -07:00
Elliott Hughes 4d835ae06f am af2e6e1f: am 93266ed1: Merge changes I2998e40a,I03eacfa1
* commit 'af2e6e1fba600730d3f323822d86bb2d55208d39':
  Partially revert argument escaping.
  Uniformly escape shell arguments.
2014-08-05 23:01:29 +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
Eric Laurent d91e6df901 audio: add defines for audio HW sync source
Bug: 16132368.
Change-Id: I4008c315f2cba9c6027998be92f4af649359bcce
2014-08-05 15:02:57 -07:00
Elliott Hughes a613844e13 am e07a6e63: am 6d9a5ac3: Merge "[MIPSR6] Skip pixelflinger, memset assembler code on mips32r6"
* commit 'e07a6e6337a959c45ab71acf6ff1fad8a8ac5dfd':
  [MIPSR6] Skip pixelflinger, memset assembler code on mips32r6
2014-08-05 21:43:16 +00:00
Eric Laurent 4a96142c45 am 3b1215c3: Merge "sound_trigger HAL update" into lmp-dev
* commit '3b1215c374d9267a61c588826b97ccd54f052bc9':
  sound_trigger HAL update
2014-08-05 19:58:48 +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
Eric Laurent 3b1215c374 Merge "sound_trigger HAL update" into lmp-dev 2014-08-05 17:41:31 +00:00
Elliott Hughes 6d9a5ac394 Merge "[MIPSR6] Skip pixelflinger, memset assembler code on mips32r6" 2014-08-05 17:41:26 +00:00
Brian Carlstrom 361e593814 am 2a363421: Add uncached argument to BacktraceMap::Create on darwin
* commit '2a363421348fb83963b44752c524c4023b34c996':
  Add uncached argument to BacktraceMap::Create on darwin
2014-08-05 13:26:10 +00:00
Brian Carlstrom 34f9b1e9f2 am 2ea89b63: am 936a236b: Merge "Add uncached argument to BacktraceMap::Create on darwin"
* commit '2ea89b631d58ecd8edd7165ed8840d1e1047aa72':
  Add uncached argument to BacktraceMap::Create on darwin
2014-08-05 13:11:42 +00:00
Brian Carlstrom 2a36342134 Add uncached argument to BacktraceMap::Create on darwin
(cherry picked from commit b978a329ef)

Change-Id: Ia2ce3193bc0b17f2a17bb3757a5930b03f84c5ec
2014-08-05 00:48:45 -07: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 ec5e597922 am 7d3d5229: am 1f5af3c2: Merge "Allow getting an uncached process map."
* commit '7d3d5229c1ebe0624bc81ce2c918a74d27695687':
  Allow getting an uncached process map.
2014-08-05 03:03:49 +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
Christopher Ferris 1cbdb2f773 am f02593b0: Allow getting an uncached process map.
* commit 'f02593b0e61f8108449770094caa7bb39a646ec1':
  Allow getting an uncached process map.
2014-08-05 02:28:01 +00:00
Elliott Hughes 42cad50fa7 am 3679d5f4: Merge "Fix sdcard truncates." into lmp-dev
* commit '3679d5f49a1e3caf69fffd1afa2d6139a0bfbb17':
  Fix sdcard truncates.
2014-08-05 02:28:00 +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
Elliott Hughes 56b28f6b2c Merge "RefBase: make Renamer destructor virtual" 2014-08-05 00:30:25 +00:00