summaryrefslogtreecommitdiffstats
path: root/adb
Commit message (Collapse)AuthorAgeFilesLines
* 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 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 e79cd67c: am 0101b06f: Merge "Kill HAVE_BIG_ENDIAN, HAVE_ENDIAN_H, and ↵Elliott Hughes2014-11-224-68/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | HAVE_LITTLE_ENDIAN." * commit 'e79cd67cfdd7efce3c9790a45c166395227ef4e8': Kill HAVE_BIG_ENDIAN, HAVE_ENDIAN_H, and HAVE_LITTLE_ENDIAN.
| * | | am 0101b06f: Merge "Kill HAVE_BIG_ENDIAN, HAVE_ENDIAN_H, and ↵Elliott Hughes2014-11-224-68/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | HAVE_LITTLE_ENDIAN." * commit '0101b06fa6f9863ee87e89757e70900c3a0e7bfc': Kill HAVE_BIG_ENDIAN, HAVE_ENDIAN_H, and HAVE_LITTLE_ENDIAN.
| | * | Kill HAVE_BIG_ENDIAN, HAVE_ENDIAN_H, and HAVE_LITTLE_ENDIAN.Elliott Hughes2014-11-214-68/+1
| | | | | | | | | | | | | | | | Change-Id: I9e25ac9d27e95b04fb8bf7a66c619af0139d8b8f
* | | | am f8304929: am 6fe92d1a: Merge "system/core: Remove AID_GRAPHICS from adb ↵Nick Kralevich2014-11-221-3/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | groups" * commit 'f8304929a059f80f42e97ea71c09a2d8a9c04874': system/core: Remove AID_GRAPHICS from adb groups
| * | | am 6fe92d1a: Merge "system/core: Remove AID_GRAPHICS from adb groups"Nick Kralevich2014-11-221-3/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '6fe92d1a3fb17545d82d020a3c995f32e6b71f9d': system/core: Remove AID_GRAPHICS from adb groups
| | * | system/core: Remove AID_GRAPHICS from adb groupsAjay Dudani2014-11-211-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove AID_GRAPHICS from adb access groups to limit framebuffer access. Change-Id: I7fc6dca8b02a45d67d1ecc4a4daf6c38741ffb94
* | | | am f799fac2: resolved conflicts for merge of bc2168c9 to lmp-mr1-dev-plus-aospElliott Hughes2014-11-214-415/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'f799fac2437987c9785805912931e6b90f15fa6b': Remove the adb usb vendor id whitelist.
| * | | resolved conflicts for merge of bc2168c9 to lmp-mr1-dev-plus-aospElliott Hughes2014-11-214-415/+0
| |\ \ \ | | |/ / | | | | | | | | Change-Id: Ic53ce9bdb658838368b4e9029a1f7a4137dd0499
| | * | Remove the adb usb vendor id whitelist.Elliott Hughes2014-11-214-412/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If there are bad vendors, we should blacklist them. Whitelisting the entire world is crazy. Change-Id: I1f4c27fd34fc420e2a3b4b2c8749198030db69f1
* | | | am 30ebda58: am 97e1e170: Merge "Disable vendor id filtering for OS X."Elliott Hughes2014-11-211-56/+37
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '30ebda58388e7c251e04fe0dfdc30e23010d0a4f': Disable vendor id filtering for OS X.
| * | | am 97e1e170: Merge "Disable vendor id filtering for OS X."Elliott Hughes2014-11-211-56/+37
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '97e1e1704245d4c2edd8a9e155669aaae7341b7d': Disable vendor id filtering for OS X.
| | * | Merge "Disable vendor id filtering for OS X."Elliott Hughes2014-11-211-56/+37
| | |\ \
| | | * | Disable vendor id filtering for OS X.Al Sutton2014-11-211-56/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Companion patch for change I2bf583a27f9a3f98ef006ea62b906a4f89960507. Due to the use of USB class 0xff it's not possible to register a listener which uses the OS methods for filtering notifications, so this patch also introduces a check in the notification listener which checks the class, subclass, and protocol for the interface each notification relates to. Change-Id: I380cc80f96addc5057660efb2179b35f9378886a
* | | | | am 542324f4: am 0750f786: Merge "Remove explict use of ASCII encoding"Elliott Hughes2014-11-211-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '542324f4b48897d40adb010afc440261c599633d': Remove explict use of ASCII encoding
| * | | | am 0750f786: Merge "Remove explict use of ASCII encoding"Elliott Hughes2014-11-211-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '0750f78659758352490e599d057a39dc44e93340': Remove explict use of ASCII encoding
| | * | | Merge "Remove explict use of ASCII encoding"Elliott Hughes2014-11-211-1/+1
| | |\ \ \
| | | * | | Remove explict use of ASCII encodingAl Sutton2014-11-211-1/+1
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | automerge: aa98c83 * commit 'aa98c835462177597eba90eac297a1a86f4a02d0': adb: Add USB vendor ID for Ubiquiti Networks, Inc.
| * | | | 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 4c2aec09: am aa3e17e1: Merge "Return path including executable instead of ↵Elliott Hughes2014-11-201-5/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | without" * commit '4c2aec09cf2da437f3995ff4cac87e4c20d1d4b0': Return path including executable instead of without
| * | | | am aa3e17e1: Merge "Return path including executable instead of without"Elliott Hughes2014-11-201-5/+5
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'aa3e17e1b685218cddeb7a05e68ff1721a322147': Return path including executable instead of without
| | * | | Merge "Return path including executable instead of without"Elliott Hughes2014-11-201-5/+5
| | |\ \ \
| | | * | | Return path including executable instead of withoutAl Sutton2014-11-201-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 1bc314d3: am 51184950: Merge "Disable vendor id filtering for Linux."Elliott Hughes2014-11-202-20/+4
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '1bc314d3dda8a2e34d48c3811c0b29b9135f9051': Disable vendor id filtering for Linux.
| * | | | | am 51184950: Merge "Disable vendor id filtering for Linux."Elliott Hughes2014-11-202-20/+4
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '511849507a7b2f4e259f6763c62f0c8619977b06': Disable vendor id filtering for Linux.
| | * | | | 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 2097e9a1: am 20860a28: Merge "Fix building on modern versions of Xcode ↵Elliott Hughes2014-11-191-7/+7
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | and OS X." * commit '2097e9a1491e850545cd0c38522c22dafd2cf6af': Fix building on modern versions of Xcode and OS X.
| * | | | am 20860a28: Merge "Fix building on modern versions of Xcode and OS X."Elliott Hughes2014-11-191-7/+7
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '20860a28c5be013da111cb794c92dae02aa30089': Fix building on modern versions of Xcode and OS X.
| | * | | Fix building on modern versions of Xcode and OS X.Al Sutton2014-11-191-7/+7
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 eda507e4: am 0655d38b: Merge "Revert "adb: Add USB vendor ID for Honeywell""Elliott Hughes2014-11-181-3/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'eda507e4921bf6f027d88433fc4e15f4b860046d': Revert "adb: Add USB vendor ID for Honeywell"
| * | | 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 0aa45710: am 6a56ad28: Merge "kill HAVE_TERMIO_H"Yabin Cui2014-11-181-12/+17
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '0aa45710d5c850bf673b14cf4894cee8eb43ce9b': kill HAVE_TERMIO_H
| * | | | am 6a56ad28: Merge "kill HAVE_TERMIO_H"Yabin Cui2014-11-181-12/+17
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '6a56ad28c385ad799f25a1b90213b2367fcb9e22': kill HAVE_TERMIO_H
| | * | | kill HAVE_TERMIO_HYabin Cui2014-11-171-12/+17
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18398307 Change-Id: Idbb89a074cdf16869cae3f667e89472781f37a5f
| * | | | Introduce "adb keygen"Nick Kralevich2014-11-173-3/+34
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 86c9e5f * commit '86c9e5f7e20a3f1712038ce642628c2e1e866434': Introduce "adb keygen"
| | * | | | Introduce "adb keygen"Nick Kralevich2014-11-143-3/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce the "adb keygen" command. Usage: adb keygen <filename> This command creates an adb public/private key pair in a user specified file. This can be used to create new adb keys, or rotate existing keys. Modify adb's key generation routines to use the HOSTNAME/LOGNAME environment variables if available. This allows someone to override the username/hostname embedded within the adb public key file if desired. Fallback to the old mechanisms if those environment variables aren't available. Bug: 18342715 Change-Id: Ibccee6088d4609aa05ad6687d3a1d8a8689d3e8a (cherry picked from commit af782b9f2ac4fb817ded80d4317a45345bb3f992) Change-Id: Ic76ffc9412171dddc879af0bbf6e20fbe1a8f057
| | * | | | Fix adb/fastboot windows compilations.Christopher Ferris2014-11-064-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many of the windows files where not including stdlib.h even though they are using malloc/free calls. Bug: 18283958 (cherry picked from commit ae7bf0959bd3f79afbf365e41f015ed1c304afdc) Change-Id: Iebc09cc314fa8f0ba6c6cd45ba26135052f156dd
* | | | | | Merge "Introduce "adb keygen""Nick Kralevich2014-11-143-3/+34
|\ \ \ \ \ \