summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "ADB on linux: Handle USB SuperSpeed extra Descriptors"Elliott Hughes2014-12-081-0/+12
|\
| * ADB on linux: Handle USB SuperSpeed extra DescriptorsIngo Rohloff2014-05-161-0/+12
| | | | | | | | | | | | | | | | | | | | Under Linux, ADB manually parses USB Descriptors to check for possible ADB USB Interfaces. USB Devices connected with SuperSpeed will exhibit extra USB SuperSpeed Endpoint Companion Descriptors. This patch handles these USB SuperSpeed specific USB Descriptors. Change-Id: Icd1e5fdde0b324c7df4f933583499f2c52a922f3 Signed-off-by: Ingo Rohloff <lundril@gmx.de>
* | Merge "adb: enable superspeed support"Elliott Hughes2014-12-081-7/+56
|\ \
| * | adb: enable superspeed supportZhuang Jin Can2014-12-081-7/+56
| | | | | | | | | | | | | | | | | | Change-Id: I5a350bfa5641365d7a0939d89c6f477c335e948a Signed-off-by: Zhuang Jin Can <jin.can.zhuang@intel.com> Signed-off-by: Robert Chiras <robert.chiras@intel.com>
* | | Merge "Clean up adb/Android.mk"Elliott Hughes2014-12-081-6/+2
|\ \ \
| * | | Clean up adb/Android.mkTrevor Drake2014-12-071-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed redundant LOCAL_C_INCLUDES. Switch from using libunz to libz Change-Id: Ic90c582fa56453bbac09561158e73f240dd47503
* | | | Merge "Reject zip archives whose entry names are not valid UTF-8."Narayan Kamath2014-12-084-5/+128
|\ \ \ \ | |/ / / |/| | |
| * | | Reject zip archives whose entry names are not valid UTF-8.Narayan Kamath2014-12-084-5/+128
| | | | | | | | | | | | | | | | | | | | bug: 18584205 Change-Id: Iaf3e8211dab6a1e3923f7fee6ea7fc693972dba3
* | | | Merge "Clean up libutils Android.mk"Elliott Hughes2014-12-061-10/+0
|\ \ \ \
| * | | | Clean up libutils Android.mkTrevor Drake2014-12-061-10/+0
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed LOCAL_C_INCLUDES as the external/zlib headers are no longer referenced by anything in libutils. Removed unused host_commonLdlibs build variable. This was referenced by the lib64utils host target which was removed in commit 03cc1f747 Tested compiling some of the projects that make use of libcutils using a clean out dir with the folllowing targets aosp_arm-eng : make -j16 logd dexdump aosp-flouder-userdebug : make -j16 keystore vold libjavacore logd aosp-x86_64-eng : make -j16 keystore vold libjavacore logd dexdump Change-Id: I663e52bbf28dde27866dad9429bf95ada6b594a5
* | | | Merge "Clean up libziparchive Android.mk"Elliott Hughes2014-12-061-6/+0
|\ \ \ \
| * | | | Clean up libziparchive Android.mkTrevor Drake2014-12-061-6/+0
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed LOCAL_C_INCLUDES which are no longer necessary as zlib now uses the LOCAL_EXPORT_C_INCLUDE_DIRS mechanism. Removed a couple of redundant LOCAL_MODULE entries Tested compiling some of the projects that make use of libziparchive and libziparchive-host using a clean out dir with aosp_flounder-userdebug aosp_arm-eng targets make -j3 libziparchive libandroidfw libartd libart libjavacore libjavacoretests aapt Change-Id: I2988f1b3a62d1df2b5eada4ad39a9246ac1184fb
* | | | Merge "logd: auditd remove logDmesg method"Mark Salyzyn2014-12-053-34/+44
|\ \ \ \
| * | | | logd: auditd remove logDmesg methodMark Salyzyn2014-12-053-34/+44
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - logDmesg method consumes considerable memory resources (typically 128KB depending on kernel) - In the future (eg: klogd, syslogd) there may be need to feed multiple logs or threads with the retrieved data. - By moving the actions of logDmesg into the mainline that instantiates the thread objects, we can leverage a single allocation of the the kernel log allocation. - logDmesg (private) is replaced with log (public) which has a more useful and descriptive purpose for the class. Change-Id: Ie2dd0370661493c1e596a7e486904a0e8caab9ff
* | | | Merge "logcat: use liblog to determine -b all list"Mark Salyzyn2014-12-051-25/+20
|\ \ \ \
| * | | | logcat: use liblog to determine -b all listMark Salyzyn2014-12-051-25/+20
|/ / / / | | | | | | | | | | | | | | | | | | | | - This is done to prevent the administrivia of adjusting logcat sources every time a new log id is added. Change-Id: I0074afb00694c2c00f6c3a66e58c15691146a6c5
* | | | Merge "Clean up libzipfile Android.mk"Elliott Hughes2014-12-051-11/+3
|\ \ \ \
| * | | | Clean up libzipfile Android.mkTrevor Drake2014-12-051-11/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch to using libz instead of libunz as per the note in external/zlib/Android.mk. Removed LOCAL_C_INCLUDES which are no longer necessary as zlib now uses the LOCAL_EXPORT_C_INCLUDE_DIRS mechanism. Tested compiling the projects that make use of libzipfile using a clean out dir with both aosp_flounder-userdebug and aosp_arm-eng make -j16 test_zipfile fastboot adb adbd libSR_Core libsrec_jni Change-Id: I5fdf34b6c272ae64c406e5b77ab67a5f5e4b5890
* | | | | Merge "Lose kill to toybox."Elliott Hughes2014-12-052-261/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Lose kill to toybox.Elliott Hughes2014-12-042-261/+0
|/ / / / | | | | | | | | | | | | Change-Id: Icca3eb4b78e07eb49b090cc98dc3ca3f5c5ea8a6
* | | | Merge "Toolbox: Disable unused-XXX warnings"Andreas Gampe2014-12-051-0/+4
|\ \ \ \
| * | | | Toolbox: Disable unused-XXX warningsAndreas Gampe2014-12-041-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For build-system CFLAGS clean-up, disable warnings locally. Should be reverted when the code is fixed. Bug: 18632512 Change-Id: Ia373784ec36d37545a7e50db1df9f8cc37d7bf30
* | | | | Merge "Lose vmstat to toybox."Elliott Hughes2014-12-042-248/+0
|\ \ \ \ \
| * | | | | Lose vmstat to toybox.Elliott Hughes2014-11-252-248/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifcb64292bb147ad592d1a627bb8dbb684f4a27e4
* | | | | | Merge "Use __arm__ instead of ARCH_ARM."Elliott Hughes2014-12-041-1/+1
|\ \ \ \ \ \
| * | | | | | Use __arm__ instead of ARCH_ARM.Elliott Hughes2014-12-041-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | Change-Id: I777da5757f01d8328d5475e654d56d81dc802655
* | | | | | Merge "Remove dead code."Elliott Hughes2014-12-042-124/+0
|\ \ \ \ \ \
| * | | | | | Remove dead code.Elliott Hughes2014-12-032-124/+0
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Intel accidentally made this dead code in 2010 with commit 2bef93cc20155c3a59cdbb22c564c4b385b2c160, and no one's ever noticed. Since no one noticing for so long implies that it doesn't matter, let's just kill the supposedly optimized code. Change-Id: Id5b37056cb8884c20bfe2db362e19b46f02e337d
* | | | | | 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 "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
* | | | | | 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>
* | | | | | 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
* | | | | Merge "Lose readlink to toybox."Elliott Hughes2014-11-272-96/+0
|\ \ \ \ \
| * | | | | Lose readlink to toybox.Elliott Hughes2014-11-262-96/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I933542dfdec7693f856d7368ff5661957ccabf74
* | | | | | 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
* | | | | | 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
* | | | | | Merge "Lose dmesg to toybox."Elliott Hughes2014-11-262-59/+0
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Lose dmesg to toybox.Elliott Hughes2014-11-252-59/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I29a6bf5e628e29e9b635fac2b23106220e36d6a3
* | | | | | Merge "Lose nohup to toybox."Elliott Hughes2014-11-262-27/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Lose nohup to toybox.Elliott Hughes2014-11-252-27/+0
|/ / / / / | | | | | | | | | | | | | | | Change-Id: I2928534bc70c6c77cdc90b658029567f00e7f6ad
* | | | | 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
* | | | | Merge "Only Win32 doesn't have writev."Elliott Hughes2014-11-251-2/+2
|\ \ \ \ \
| * | | | | Only Win32 doesn't have writev.Elliott Hughes2014-11-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9b5328cea3c88a75135dcb0711cbb5471e8fa388