summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am ad32ebec: am 97133621: Merge "system: core: fastboot: Increase USB ↵Badhri Jagan Sridharan2014-12-052-3/+3
|\ | | | | | | | | | | | | protocol buffer size to 1024" * commit 'ad32ebecc9a0d781f66f39f467be0b30cc05f65b': system: core: fastboot: Increase USB protocol buffer size to 1024
| * am 97133621: Merge "system: core: fastboot: Increase USB protocol buffer ↵Badhri Jagan Sridharan2014-12-042-3/+3
| |\ | | | | | | | | | | | | | | | | | | size to 1024" * commit '971336213a32e5f3841bc22413632e0108f1c9e2': system: core: fastboot: Increase USB protocol buffer size to 1024
| | * Merge "system: core: fastboot: Increase USB protocol buffer size to 1024"Badhri Jagan Sridharan2014-12-042-3/+3
| | |\
| | | * system: core: fastboot: Increase USB protocol buffer size to 1024Channagoud Kadabi2014-11-072-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With USB3.0 SS support the max packet size supported by USB protocol is 1024 bytes. When connected to a USB device in SuperSpeed, if only 512 bytes are sent at a time the device would interpret each transfer as a short packet and slows down overall throughput. To accommodate for SuperSpeed USB bulk endpoints, increase the buffer size to 1024. Change-Id: I4f447fe38045bc0008e2d6dd3f36c2d6819d6c15
* | | | Merge "Fix build"Paul Lawrence2014-12-041-1/+1
|\ \ \ \
| * | | | Fix buildPaul Lawrence2014-12-041-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I9b493fd5fc5c5f62f02bc5234ccca2a5118380b4
* | | | | Merge "Add adb enable-verity"Paul Lawrence2014-12-046-30/+103
|\ \ \ \ \ | |/ / / /
| * | | | Add adb enable-verityPaul Lawrence2014-12-046-30/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that it is *easy* to break your phone with this feature. It is not a bug that reenabling verity after changing one byte of the system partition stops the device booting. Bug: 18529433 Change-Id: I632e91281884471a362960f1ba30312d2669b8ff
* | | | | am caaaa278: am 6855af41: Merge "libpixelflinger should #define ↵Elliott Hughes2014-12-041-0/+1
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | __ARM_HAVE_NEON." * commit 'caaaa278651590bb838e4bb550303771a167eaaf': libpixelflinger should #define __ARM_HAVE_NEON.
| * | | | am 6855af41: Merge "libpixelflinger should #define __ARM_HAVE_NEON."Elliott Hughes2014-12-041-0/+1
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * commit '6855af4135c9cd29a42f7c22ca7c394d902faea5': libpixelflinger should #define __ARM_HAVE_NEON.
| | * | | Merge "libpixelflinger should #define __ARM_HAVE_NEON."Elliott Hughes2014-12-041-0/+1
| | |\ \ \
| | | * | | libpixelflinger should #define __ARM_HAVE_NEON.Elliott Hughes2014-12-031-0/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | Bug: 18556103 Change-Id: Ife07cf63948f1c248bcde5685cdb6d89c373d988
* | | | | am fa969cd1: am 023bc0a4: Merge "Fix deadlocks."Elliott Hughes2014-12-041-3/+3
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | * commit 'fa969cd1f93d186acc9ce781fffa6a2f66f915ea': Fix deadlocks.
| * | | am 023bc0a4: Merge "Fix deadlocks."Elliott Hughes2014-12-041-3/+3
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '023bc0a426d0500904d5a9d2ddf4b7dfecf9ce6a': Fix deadlocks.
| | * | Merge "Fix deadlocks."Elliott Hughes2014-12-031-3/+3
| | |\ \
| | | * | Fix deadlocks.Bao Haojun2014-05-141-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Close pipe fds[1] as soon as possible. Otherwise it may block when reading from fds[0] even though the child process has exited early and closed its copy of fds[1]. 2. Waitpid after pipe is closed. Otherwise the screencap child process may block while writing fds[1], because the fds[0] is not closed yet. If we close fds[0] first, then the screencap child process will die because of SIGPIPE, and waitpid will return correctly. Change-Id: I433c95a5ba2eb3045727fc39a49fd9557fb1a1d1 Signed-off-by: Bao Haojun <baohaojun@gmail.com>
* | | | | am 96bc6841: am bc260206: Merge "Fix build."Dan Albert2014-11-281-10/+11
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '96bc6841240d09050ef336461b9a13792f8080ed': Fix build.
| * | | | am bc260206: Merge "Fix build."Dan Albert2014-11-281-10/+11
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'bc2602068d83b0226a614ed143cebd708c5fabd2': Fix build.
| | * | | Merge "Fix build."Dan Albert2014-11-281-10/+11
| | |\ \ \
| | | * | | Fix build.Dan Albert2014-11-281-10/+11
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | More UD literals that weren't caught by hammerhead... Change-Id: I6b0abdeef41d1f40c2fe86843b5149925ff6356e
* | | | | am a03656d8: resolved conflicts for merge of 809965cc to lmp-mr1-dev-plus-aospElliott Hughes2014-11-272-96/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'a03656d884ff06e2e1894ba33cb3cc9afe58cf4e': Lose readlink to toybox.
| * | | | resolved conflicts for merge of 809965cc to lmp-mr1-dev-plus-aospElliott Hughes2014-11-272-96/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | Change-Id: Ifbfe91b16e44b2acd08de48a5cdd2176bd664d0a
| | * | | Merge "Lose readlink to toybox."Elliott Hughes2014-11-272-96/+0
| | |\ \ \
| | | * | | Lose readlink to toybox.Elliott Hughes2014-11-262-96/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I933542dfdec7693f856d7368ff5661957ccabf74
* | | | | | am fafbd329: am ba1552bd: Merge "Clarify the strcmp() with the empty string."Stephen Hines2014-11-271-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'fafbd329cb1685dc91172230a0671175e80ca8b3': Clarify the strcmp() with the empty string.
| * | | | | am ba1552bd: Merge "Clarify the strcmp() with the empty string."Stephen Hines2014-11-271-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'ba1552bd2438a8a47779ed3d05d5ce15bfb5741c': Clarify the strcmp() with the empty string.
| | * | | | Merge "Clarify the strcmp() with the empty string."Stephen Hines2014-11-261-1/+1
| | |\ \ \ \
| | | * | | | Clarify the strcmp() with the empty string.Stephen Hines2014-11-261-1/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | Change-Id: Ie246b3c2de3f19b95693f634b0ebd46bdcf3962b
* | | | | | am 8d49c8b0: am f66486ef: Merge "Fix incorrect path name check."Stephen Hines2014-11-271-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '8d49c8b0bfdc7bed855acec603bacc355b5bcb8c': Fix incorrect path name check.
| * | | | | am f66486ef: Merge "Fix incorrect path name check."Stephen Hines2014-11-271-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'f66486ef09bfc53da65ca6b4137c47d583f31356': Fix incorrect path name check.
| | * | | | Merge "Fix incorrect path name check."Stephen Hines2014-11-261-1/+1
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Fix incorrect path name check.Stephen Hines2014-11-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was caught by clang 3.6's -Wpointer-bool-conversion. The device_path field is a char[256], and thus never NULL. The intention for this code was to check whether or not there is a named path at all. Checking whether this is an empty string matches the original intent. Change-Id: I5ccedc03167e6a457e472089de26130aff7f96e3
* | | | | | am 330d8927: am b553a18a: Merge "Lose dmesg to toybox."Elliott Hughes2014-11-272-59/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '330d89278262c9fac0bf9be82dc03621daa9faa6': Lose dmesg to toybox.
| * | | | | am b553a18a: Merge "Lose dmesg to toybox."Elliott Hughes2014-11-272-59/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'b553a18a02cd90298716c88d9167f877b63a36b6': Lose dmesg to toybox.
| | * | | | Merge "Lose dmesg to toybox."Elliott Hughes2014-11-262-59/+0
| | |\ \ \ \
| | | * | | | Lose dmesg to toybox.Elliott Hughes2014-11-252-59/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I29a6bf5e628e29e9b635fac2b23106220e36d6a3
* | | | | | | am be7bb900: am 47f52f24: audio: new stream typesEric Laurent2014-11-261-4/+8
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'be7bb9004c8663d145b998b6a6a349cb136dd6ae': audio: new stream types
| * | | | | | am 47f52f24: audio: new stream typesEric Laurent2014-11-261-4/+8
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '47f52f247d6d895878b831de448f19b98225515d': audio: new stream types
| | * | | | | | audio: new stream typesEric Laurent2014-11-241-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added stream types for internal use by audio policy and audio flinger. Bug: 18067208. Change-Id: I90fd4df9ed5e0d8fb8c220d67e95fd0e32a06f14
* | | | | | | | am a7ec5f10: am 50ac7725: Merge "Lose nohup to toybox."Elliott Hughes2014-11-262-27/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a7ec5f1067d640be206bf597a67c64750b8a1fef': Lose nohup to toybox.
| * | | | | | | am 50ac7725: Merge "Lose nohup to toybox."Elliott Hughes2014-11-262-27/+0
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | * commit '50ac7725a5f1c195989888277341f22ab54f979b': Lose nohup to toybox.
| | * | | | | | Merge "Lose nohup to toybox."Elliott Hughes2014-11-262-27/+0
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | | * | | | | Lose nohup to toybox.Elliott Hughes2014-11-252-27/+0
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I2928534bc70c6c77cdc90b658029567f00e7f6ad
* | | | | | | am bbd3b7ed: am c0ac9313: Merge "Only Windows doesn\'t have <sys/uio.h>."Elliott Hughes2014-11-252-7/+10
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'bbd3b7edd7d2871e2327250219bb70e7c653e63d': Only Windows doesn't have <sys/uio.h>.
| * | | | | | am c0ac9313: Merge "Only Windows doesn\'t have <sys/uio.h>."Elliott Hughes2014-11-252-7/+10
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'c0ac9313e942fb7d3a027cec41904c18d8841521': Only Windows doesn't have <sys/uio.h>.
| | * | | | | Merge "Only Windows doesn't have <sys/uio.h>."Elliott Hughes2014-11-252-7/+10
| | |\ \ \ \ \
| | | * | | | | Only Windows doesn't have <sys/uio.h>.Elliott Hughes2014-11-252-7/+10
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should probably be in libcutils instead, so code that needs to care about Windows can use readv/writev. Change-Id: I7c2ceec3f742cee0e44f69fd4c88459376bd0e08
* | | | | | | am f11758bb: am 9c7e5c7c: Merge "Only Win32 doesn\'t have writev."Elliott Hughes2014-11-251-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'f11758bb58af4241817b0b374f913b39d1f32e44': Only Win32 doesn't have writev.
| * | | | | | am 9c7e5c7c: Merge "Only Win32 doesn\'t have writev."Elliott Hughes2014-11-251-2/+2
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '9c7e5c7c33607fce4c91e22dcf38237256450b9a': Only Win32 doesn't have writev.
| | * | | | | Merge "Only Win32 doesn't have writev."Elliott Hughes2014-11-251-2/+2
| | |\ \ \ \ \