summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 0750f786: Merge "Remove explict use of ASCII encoding"Elliott Hughes2014-11-212-2/+2
|\ | | | | | | | | * commit '0750f78659758352490e599d057a39dc44e93340': Remove explict use of ASCII encoding
| * Merge "Remove explict use of ASCII encoding"Elliott Hughes2014-11-212-2/+2
| |\
| | * Remove explict use of ASCII encodingAl Sutton2014-11-212-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the use of CFStringGetCString with kCFStringEncodingASCII specified with CFStringGetFileSystemRepresentation which will ensure the correct character encoding is used to conver the CFString into a NULL terminated char array suitable for use with POSIX APIs. Change-Id: Ibab1dc05c4f4db8604d329a493b4241992b8e69d
* | | am 01d49e85: Merge "adb: Add USB vendor ID for Ubiquiti Networks, Inc."Elliott Hughes2014-11-211-0/+3
|\ \ \ | |/ / | | | | | | | | | * commit '01d49e854fa09a776c9673b229efcfa2d53adfea': adb: Add USB vendor ID for Ubiquiti Networks, Inc.
| * | Merge "adb: Add USB vendor ID for Ubiquiti Networks, Inc."Elliott Hughes2014-11-211-0/+3
| |\ \
| | * | adb: Add USB vendor ID for Ubiquiti Networks, Inc.Jeremy Chang2014-11-191-0/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Iedb86b9ff8dc55aea5d0df201a98c96418002207 Signed-off-by: Jeremy Chang <jeremy@ubnt.com>
* | | | am 84babf39: Merge "Fix format string"Chih-Hung Hsieh2014-11-211-3/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '84babf397420528df3944636bc46bab741e21aea': Fix format string
| * | | Merge "Fix format string"Chih-Hung Hsieh2014-11-211-3/+4
| |\ \ \
| | * | | Fix format stringChih-Hung Hsieh2014-11-201-3/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Make a format string match the type of the parameter it represents Change-Id: I0af88636448084b56450996ea9dafdba3c1fd2a3 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org
* | | | am 07148ea2: Merge "Make mkdirAndChown do what it claims to do"Chih-hung Hsieh2014-11-211-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '07148ea2be8110e2310860c5e6a391e542a656be': Make mkdirAndChown do what it claims to do
| * | | Merge "Make mkdirAndChown do what it claims to do"Chih-hung Hsieh2014-11-211-2/+2
| |\ \ \ | | |_|/ | |/| |
| | * | Make mkdirAndChown do what it claims to doBernhard Rosenkränzer2014-11-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, mkdirAndChown takes parameters for mode, uid and gid, but ignores them and hardcodes 0750, AID_SYSTEM, AID_SYSTEM instead. This doesn't matter much because so far its only invocation passes exactly those values as parameters -- but clang complains about unused parameters. Might as well make the function do what it claims to do. Change-Id: I5a8056be3278a0c5d0a576dbc061288aa0956a35 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | | am 5d8a5ade: Merge "Add a pre-C++11 constexpr compatibility macro."Dan Albert2014-11-201-0/+11
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '5d8a5ade620be65e0e658dbb99e66398f3ffdc74': Add a pre-C++11 constexpr compatibility macro.
| * | | Merge "Add a pre-C++11 constexpr compatibility macro."Dan Albert2014-11-201-0/+11
| |\ \ \
| | * | | Add a pre-C++11 constexpr compatibility macro.Dan Albert2014-11-201-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed for cases where something should be constexpr if possible, but not being constexpr is fine if in pre-C++11 code (such as a const static float member variable). Bug: 18466763 Change-Id: I635d062575ba2fbc4cbe3a89f730128c404d95e1
* | | | | am aa3e17e1: Merge "Return path including executable instead of without"Elliott Hughes2014-11-202-10/+10
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'aa3e17e1b685218cddeb7a05e68ff1721a322147': Return path including executable instead of without
| * | | | Merge "Return path including executable instead of without"Elliott Hughes2014-11-202-10/+10
| |\ \ \ \
| | * | | | Return path including executable instead of withoutAl Sutton2014-11-202-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous implementation returned the path the executable was in instead of returning the path including the executable (i.e. it returned ...bin instead of ...bin/executable). This is not what the original methods did and caused the process forking of adb to fail. This patch corrects the implementation. Change-Id: Ib58497cab35706041f170c1bc97c31fd5d965f90
* | | | | | am 51184950: Merge "Disable vendor id filtering for Linux."Elliott Hughes2014-11-202-20/+4
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '511849507a7b2f4e259f6763c62f0c8619977b06': Disable vendor id filtering for Linux.
| * | | | | Merge "Disable vendor id filtering for Linux."Elliott Hughes2014-11-202-20/+4
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Disable vendor id filtering for Linux.Elliott Hughes2014-11-192-20/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's time we switched to blacklisting any problematic devices rather than slowly whitelisting the entire world. This seems to work for me, but let's see how other people get on before coming back to actually remove the list. We'll also need to find a Mac to test the equivalent Mac change. Change-Id: I2bf583a27f9a3f98ef006ea62b906a4f89960507
* | | | | am 46ee85fc: Merge "kill HAVE_PREAD"Yabin Cui2014-11-201-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '46ee85fcc301471aff9d95a817599349570dcef8': kill HAVE_PREAD
| * | | | Merge "kill HAVE_PREAD"Yabin Cui2014-11-201-2/+2
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | kill HAVE_PREADYabin Cui2014-11-191-2/+2
| |/ / / | | | | | | | | | | | | | | | | Bug: 18397613 Change-Id: I3990bd0f95cf38c5a9229180a1ddc699941892fc
* | | | logd: throttle SELinux denials to 20/secNick Kralevich2014-11-190-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 83d8556 * commit '83d85563c51fa39cb61b836302a8c26fe0e2ace6': logd: throttle SELinux denials to 20/sec
| * | | | logd: throttle SELinux denials to 20/secNick Kralevich2014-11-193-22/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Impose a limit of 20 selinux denials per second. Denials beyond that point don't add any value, and have the potential to cause crashes or denial of service attacks. Do some other misc cleanup while I'm here. Bug: 18341932 (cherry picked from commit c234a1b879d9c9d8e1a797c5dcf3098249945748) Change-Id: Ic5c96003db82e504baf301e87be5c8c539c73c2a
* | | | | am 606bb5f2: Merge "logd: throttle SELinux denials to 20/sec"Nick Kralevich2014-11-193-22/+13
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * commit '606bb5f2e5f2913d5cb30ed87dd18da23dda1705': logd: throttle SELinux denials to 20/sec
| * | | | Merge "logd: throttle SELinux denials to 20/sec"Nick Kralevich2014-11-193-22/+13
| |\ \ \ \
| | * | | | logd: throttle SELinux denials to 20/secNick Kralevich2014-11-193-22/+13
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Impose a limit of 20 selinux denials per second. Denials beyond that point don't add any value, and have the potential to cause crashes or denial of service attacks. Do some other misc cleanup while I'm here. Bug: 18341932 Change-Id: I6125d629ae4d6ae131d2e53bfa41e1f50277d402
* | | | | am 20860a28: Merge "Fix building on modern versions of Xcode and OS X."Elliott Hughes2014-11-192-15/+16
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '20860a28c5be013da111cb794c92dae02aa30089': Fix building on modern versions of Xcode and OS X.
| * | | | Merge "Fix building on modern versions of Xcode and OS X."Elliott Hughes2014-11-192-15/+16
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix building on modern versions of Xcode and OS X.Al Sutton2014-11-192-15/+16
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recent versions of XCode fail to compile the adb and fastboot binaries due to two functions being deprecated in 10.9 (GetCurrentProcess and ProcessInformationCopyDictionary), and the use of -Werrror. This patch replaces the method implementations which use calls to methods deprecated in the 10.9 SDK with versions which only call non-deprecated methods. Change-Id: I855bf26aff45093ca9022924f3ecd1b80f2305a8
* | | | am 81906d4b: Merge "kill HAVE_MADVISE"Yabin Cui2014-11-191-2/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '81906d4b0c508dc308606ca232eaa055255abd1e': kill HAVE_MADVISE
| * | | Merge "kill HAVE_MADVISE"Yabin Cui2014-11-191-2/+6
| |\ \ \
| | * | | kill HAVE_MADVISEYabin Cui2014-11-191-2/+6
| |/ / / | | | | | | | | | | | | | | | | | | | | Change to avoid "unused parameter" warning. Bug: 18397020 Change-Id: I4b26de55314c78237daead8e873385b97cafe4d4
* | | | am c8ad1809: Merge "kill HAVE_MADVISE"Yabin Cui2014-11-191-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'c8ad180983fb50c89179b7895896ad1f35cb885a': kill HAVE_MADVISE
| * | | Merge "kill HAVE_MADVISE"Yabin Cui2014-11-191-2/+2
| |\ \ \
| | * | | kill HAVE_MADVISEYabin Cui2014-11-181-2/+2
| |/ / / | | | | | | | | | | | | | | | | Bug: 18397020 Change-Id: Ibc8d886d729c51932a403531888214de4e541452
* | | | am 0655d38b: Merge "Revert "adb: Add USB vendor ID for Honeywell""Elliott Hughes2014-11-181-3/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '0655d38b0c998f294ad52f1f8e84233a48046e97': Revert "adb: Add USB vendor ID for Honeywell"
| * | | Merge "Revert "adb: Add USB vendor ID for Honeywell""Elliott Hughes2014-11-181-3/+0
| |\ \ \
| | * | | Revert "adb: Add USB vendor ID for Honeywell"Elliott Hughes2014-11-181-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8c4c8e8988411449ecb2f50c25d3e4188e81e7c0. Change-Id: Ia1cad862f42e5bea3174ed2cc0eea5232fc0a858
* | | | | am 16068830: Merge "toolbox: enable mkswap to work on block devices"Elliott Hughes2014-11-181-41/+39
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '16068830444361ab65cbc9804b76e2d415aff9a2': toolbox: enable mkswap to work on block devices
| * | | | Merge "toolbox: enable mkswap to work on block devices"Elliott Hughes2014-11-181-41/+39
| |\ \ \ \
| | * | | | toolbox: enable mkswap to work on block devicesAndrew Boie2014-11-181-41/+39
| |/ / / / | | | | | | | | | | | | | | | | | | | | Change-Id: I9b71ca3fa09ffbe12dcc4d04229edab80851db4d Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
* | | | | am 91cb2cb3: Merge "toolbox: indicate why swap{on|off} failed"Elliott Hughes2014-11-182-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '91cb2cb3411472a567c8ec4e8dad9d3a1ebc1dca': toolbox: indicate why swap{on|off} failed
| * | | | Merge "toolbox: indicate why swap{on|off} failed"Elliott Hughes2014-11-182-2/+2
| |\ \ \ \
| | * | | | toolbox: indicate why swap{on|off} failedAndrew Boie2014-04-302-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1247e3592ab0f9878fb27d114fd14f9b29282b0e Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
* | | | | | am 6a56ad28: Merge "kill HAVE_TERMIO_H"Yabin Cui2014-11-181-12/+17
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '6a56ad28c385ad799f25a1b90213b2367fcb9e22': kill HAVE_TERMIO_H
| * | | | | Merge "kill HAVE_TERMIO_H"Yabin Cui2014-11-181-12/+17
| |\ \ \ \ \
| | * | | | | kill HAVE_TERMIO_HYabin Cui2014-11-171-12/+17
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | Bug: 18398307 Change-Id: Idbb89a074cdf16869cae3f667e89472781f37a5f
generated by cgit v1.1 at 2025-01-10 09:48:25 +0000