summaryrefslogtreecommitdiffstats
path: root/adb
Commit message (Collapse)AuthorAgeFilesLines
* am 42acb531: Merge "Remove obsolete vdc call." into klp-modular-devNick Kralevich2014-01-152-16/+2
|\ | | | | | | | | * commit '42acb5314c8fb01f426e946392c248fde3371aff': Remove obsolete vdc call.
| * Remove obsolete vdc call.Nick Kralevich2014-01-142-16/+2
| | | | | | | | | | | | | | | | | | Since ca8e66a8b0f843812014a28d49208f9f6f64ecbc, init has been handling reboots and filesystem unmounts. Remove obsolete call to vdc. Bug: 12504045 Change-Id: If8704ca042cb3a68857743b9973e48c52e7eb881
* | am 6f8ddbbb: am 3e8bb3ff: am e0e7595f: am e76343ef: Merge "Emerson USB ID"Colin Cross2014-01-121-0/+3
|\ \ | |/ | | | | | | * commit '6f8ddbbbe8ed2ff56a015f503f8d74431eb882dc': Emerson USB ID
| * am e76343ef: Merge "Emerson USB ID"Colin Cross2014-01-111-0/+3
| |\ | | | | | | | | | | | | * commit 'e76343ef72458aff8fdc25c57f4e84407c05a2f2': Emerson USB ID
| | * Merge "Emerson USB ID"Colin Cross2014-01-121-0/+3
| | |\
| | | * Emerson USB IDJon Sawyer2014-01-111-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds Emerson's USB id to the known USB Devices. Change-Id: If6115c2551c1f30a5c190690f2aeaaf2adff7ee1 Signed-off-by: Jon Sawyer <jon@cunninglogic.com>
* | | | am 3fb5ebc5: am 3794c96f: am c121c69b: am b0751101: Merge "HP USB ID"Colin Cross2014-01-091-0/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '3fb5ebc565f1550d61c4afb4ae6f9afa73cf12b3': HP USB ID
| * | | am b0751101: Merge "HP USB ID"Colin Cross2014-01-091-0/+3
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'b0751101b090a8732c62ad261fa44e5d6a69a2cc': HP USB ID
| | * | HP USB IDJon Sawyer2014-01-081-0/+3
| | |/ | | | | | | | | | | | | | | | | | | Adds HP's USB id to the know USB Devices Change-Id: I975126f3ae5e53f25e18dea7cc43c29076bfc965 Signed-off-by: Jon Sawyer <jon@cunninglogic.com>
* | | am b1b187f7: am 748ab31f: am d8f74f1b: am 491ecd0b: Merge changes ↵Colin Cross2014-01-061-150/+175
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Id8bec8a3,Ied42e4d0,Iea3f7cc6,Ic7f7c984,Ic77d5f71, ... * commit 'b1b187f7c870a5267ef9d7a4476e281cd6ccffc7': adb: Add USB vendor ID for YotaDevices adb: Add USB vendor ID for TechFaith adb: Add USB vendor ID for Rockchip adb: Add USB vendor ID for EMERGING Technology (Holdings) Ltd. adb: Add USB vendor ID for Allwinner adb: Add USB vendor ID for Amlogic added Gigaset's USB vendor ID adb: alphabetically sort usb vendors lists
| * | am 491ecd0b: Merge changes ↵Colin Cross2014-01-061-150/+175
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Id8bec8a3,Ied42e4d0,Iea3f7cc6,Ic7f7c984,Ic77d5f71, ... * commit '491ecd0b7275a98b7fda9b1e807724f7f06b1469': adb: Add USB vendor ID for YotaDevices adb: Add USB vendor ID for TechFaith adb: Add USB vendor ID for Rockchip adb: Add USB vendor ID for EMERGING Technology (Holdings) Ltd. adb: Add USB vendor ID for Allwinner adb: Add USB vendor ID for Amlogic added Gigaset's USB vendor ID adb: alphabetically sort usb vendors lists
| | * adb: Add USB vendor ID for YotaDevicesDanielMo2014-01-061-0/+3
| | | | | | | | | | | | | | | Change-Id: Id8bec8a35edd0d21ae52e8469f7a65b5f4433bc2 Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
| | * adb: Add USB vendor ID for TechFaithDanielMo2014-01-061-0/+3
| | | | | | | | | | | | Change-Id: Ied42e4d011b736ee990ed75e7d81bc6a16db47f9
| | * adb: Add USB vendor ID for RockchipDanielMo2014-01-061-0/+3
| | | | | | | | | | | | | | | Change-Id: Iea3f7cc6ed463684fe30a73c39445b3ca36854d9 Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
| | * adb: Add USB vendor ID for EMERGING Technology (Holdings) Ltd.DanielMo2014-01-061-0/+3
| | | | | | | | | | | | | | | Change-Id: Ic7f7c984db19050d2ce4da8ae87683ce42dc9094 Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
| | * adb: Add USB vendor ID for AllwinnerDanielMo2014-01-061-0/+3
| | | | | | | | | | | | | | | Change-Id: Ic77d5f71c9e329e33cd31fa0854e692ad794a609 Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
| | * adb: Add USB vendor ID for AmlogicDanielMo2014-01-061-0/+3
| | | | | | | | | | | | | | | Change-Id: I35fad82214f2b5a82b0150821326aaea15784de1 Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
| | * added Gigaset's USB vendor IDVolker Moesker2014-01-061-1/+3
| | | | | | | | | | | | | | | Change-Id: Iebb0f352eec4530ee1e972527fc76bbb9dad5cc3 Signed-off-by: Volker Moesker <volker.moesker@gigaset.com>
| | * adb: alphabetically sort usb vendors listsColin Cross2014-01-061-150/+155
| | | | | | | | | | | | | | | | | | | | | Sort the lists of usb vendor ids alphabetically to reduce future conflicts. Change-Id: I682c18a1d97adf3a4aa9c00de9fed932c83e4646
* | | am 2bd34772: am 42fb1783: am 4600d80c: am e1095e1d: Merge "Modify BYD\'s USB ↵Colin Cross2014-01-031-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | Vendor ID" * commit '2bd34772340174e844bd4ff1f3e2096d5a7e2cf8': Modify BYD's USB Vendor ID
| * | am e1095e1d: Merge "Modify BYD\'s USB Vendor ID"Colin Cross2014-01-031-1/+1
| |\ \ | | |/ | | | | | | | | | * commit 'e1095e1da12de9d6dc219f497f7c19d1c1f7a41b': Modify BYD's USB Vendor ID
| | * Merge "Modify BYD's USB Vendor ID"Colin Cross2014-01-031-1/+1
| | |\
| | | * Modify BYD's USB Vendor IDkongfanqing2013-05-151-1/+1
| | | | | | | | | | | | | | | | Change-Id: I391487a12ba7ed86aac81457f8026acd3fd7576c
* | | | am 4bacd1fb: am 4af0c74e: am 8be1ccff: am fcf3d207: Merge "adb: configure ↵Nick Kralevich2014-01-032-10/+65
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | /system file permission with fs_config" * commit '4bacd1fb6b278ce5efd1752d2c6fb363eef68add': adb: configure /system file permission with fs_config
| * | | am fcf3d207: Merge "adb: configure /system file permission with fs_config"Nick Kralevich2014-01-032-10/+65
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'fcf3d207c51f1e734137a08ae2fdb1bb37a50b87': adb: configure /system file permission with fs_config
| | * | adb: configure /system file permission with fs_configLiang Cheng2014-01-022-10/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adbd changes the permissions of files uploaded by copying owner's permission to group and other. This causes kernel load failure if any changes are made to kernel modules followed by ``adb push'' or ``adb sync'' because file mode 644 would become 666. The change uses fs_config to get the target mode of files. In addition, the SELinux file label is set incorrectly on synced files. Set the label properly. Change-Id: I354db848f39adfbf189d7e8d3b028e8d763c772f Signed-off-by: Liang Cheng <licheng@nvidia.com> Bug: 12264775
* | | | am 4639ae45: am a0ce4e28: am 98fdcfa9: am 67cb61ee: Merge "adb: Check ↵Nick Kralevich2013-12-193-21/+88
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | sender\'s socket id when receiving packets." * commit '4639ae452e7d22343053c5127ecb44ef19b7baf2': adb: Check sender's socket id when receiving packets.
| * | | am 67cb61ee: Merge "adb: Check sender\'s socket id when receiving packets."Nick Kralevich2013-12-193-21/+88
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '67cb61ee5a8b8f5c967361430fff250e76c3a1dc': adb: Check sender's socket id when receiving packets.
| | * | adb: Check sender's socket id when receiving packets.David 'Digit' Turner2013-12-163-21/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handle_packet() in adb.c didn't check that when an A_WRTE packet is received, the sender's local-id matches the socket's peer id. This meant that a compromised adbd server could sent packets to the host adb server, spoofing the identity of another connected device if it could "guess" the right host socket id. This patch gets rid of the issue by enforcing even more checks to ensure that all packets comply with the description in protocol.txt. + Fix a bug where closing a local socket associated with a remote one would always send an A_CLSE(0, remote-id, "") message, though protocol.txt says that should only happen for failed opens. The issue was that local_socket_close() called remote_socket_close() after clearing the remote socket's 'peer' field. The fix introduces a new asocket optional callback, named 'shutdown' that is called before that, and is used to send the A_CLSE() message with the right ID in remote_socket_shutdown(). Also add some code in handle_packet() to detect invalid close commands. Change-Id: I9098bc8c6e81f8809334b060e5dca4fc92e6fbc9
* | | | Merge "adb: deprecate legacy log service interface"Mark Salyzyn2013-12-105-103/+1
|\ \ \ \
| * | | | adb: deprecate legacy log service interfaceMark Salyzyn2013-12-105-103/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: If96019cc13b3d7a4dcd7785c7137e0cbcc622981
* | | | | am 81b488e6: am a91a47c3: am b2dfa7ec: am 02d90b92: am 33e7f915: am ↵Nick Kralevich2013-12-101-2/+2
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | | | | | 54a80bcf: am cd072e94: am ba104fb7: am e975716e: am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client * commit '81b488e6876ca5af1258473c244b4b64036fb458': Fix overflow in adb_client
| * | | am b2dfa7ec: am 02d90b92: am 33e7f915: am 54a80bcf: am cd072e94: am ↵Nick Kralevich2013-12-101-2/+2
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | ba104fb7: am e975716e: am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client * commit 'b2dfa7ece7fb69d2ce5ae517eb35492beb646385': Fix overflow in adb_client
| | * | am 02d90b92: am 33e7f915: am 54a80bcf: am cd072e94: am ba104fb7: am ↵Nick Kralevich2013-12-101-2/+2
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e975716e: am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client * commit '02d90b92ce65ad4e7f49565f0e97373e1d8b0fbf': Fix overflow in adb_client
| | | * \ am 33e7f915: am 54a80bcf: am cd072e94: am ba104fb7: am e975716e: am ↵Nick Kralevich2013-12-101-2/+2
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client * commit '33e7f915d6a27880dd4c4c0709dcc921f549eea2': Fix overflow in adb_client
| | | | * \ am 54a80bcf: am cd072e94: am ba104fb7: am e975716e: am 03d4eb29: am ↵Nick Kralevich2013-12-101-2/+2
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d63fb078: am e89e09dd: Fix overflow in adb_client * commit '54a80bcf88060b21f527c631c7ec911171bdb13f': Fix overflow in adb_client
| | | | | * \ am cd072e94: am ba104fb7: am e975716e: am 03d4eb29: am d63fb078: am ↵Nick Kralevich2013-12-101-2/+2
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e89e09dd: Fix overflow in adb_client * commit 'cd072e94cf7e546cd6d333cd65641edcd69402b7': Fix overflow in adb_client
| | | | | | * \ am d63fb078: am e89e09dd: Fix overflow in adb_clientNick Kralevich2013-12-101-2/+2
| | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd63fb078aea697c536b19c03d29d4dde4ac087fc': Fix overflow in adb_client
| | | | | | | * \ am e89e09dd: Fix overflow in adb_clientNick Kralevich2013-12-101-2/+2
| | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e89e09dd2b9b42184973e3ade291186a2737bced': Fix overflow in adb_client
| | | | | | | | * | Fix overflow in adb_clientNick Kralevich2013-12-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7f8582bd8a69d61ce47d11a9ffd0e901fc371037 Credit: Joshua Drake Bug: 12060953
* | | | | | | | | | adb: regression from Move list.c to inlinesMark Salyzyn2013-12-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I057dbe3db80b1460f774e9f9ade11e0929529ec6
* | | | | | | | | | adb: Don't clobber block devices during pushJP Abgrall2013-12-031-3/+6
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the past, an adb push would ALWAYS unlink the target path. Now, we only links and regular files (and links). This allows the following to work: adb shell ls -l /dev/block/mmcblk0p8 # brw------- root root 179, 8 2013-11-28 07:43 mmcblk0p8 adb push n7.jpa.mda.post_jb_encryption.raw /dev/block/mmcblk0p8 Bug: 11984121 Change-Id: I982c7a1cd87986621f2bebdcb41c4e281f67f772
* | | | | | | | | am f17f5591: am 36d44740: Merge "Fix a bunch of small system/core bugs."Elliott Hughes2013-10-292-1/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f17f55914e18eb176ccc5bb8266b248ece8cb56b': Fix a bunch of small system/core bugs.
| * | | | | | | | | Fix a bunch of small system/core bugs.Elliott Hughes2013-10-292-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Missing frees in: adb/file_sync_client.c fastboot/fastboot.c libsparse/output_file.c Missing closedirs in: adb/file_sync_service.c cpio/mkbootfs.c libcutils/dir_hash.c Potential buffer overrun in: gpttool/gpttool.c Incorrect NULL check in: libsparse/backed_block.c Bug: https://code.google.com/p/android/issues/detail?id=61564 Change-Id: If97838a9e73a77aef7f416c31c237ce1fca4ce21
* | | | | | | | | | am 5dadac50: am 87af04a4: Merge "Improve some adb error logging"Brian Carlstrom2013-10-282-2/+4
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5dadac50c4bbeaf8baf4d5e04c2d2706d9e74fc7': Improve some adb error logging
| * | | | | | | | | Improve some adb error loggingBrian Carlstrom2013-10-272-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11290643 Change-Id: Ibad4e9f0b69421cd6017b70a52237e7f27aab848
* | | | | | | | | | am 91704522: Don\'t return immediately from reboot commands.Nick Kralevich2013-10-241-0/+4
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '917045222a69021eb36aea96708649c709685509': Don't return immediately from reboot commands.
| * | | | | | | | | Don't return immediately from reboot commands.Nick Kralevich2013-10-241-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reboot commands return too fast, interfering with testing. Add a pause(), which will allow the device time to complete the reboot. Change-Id: Ie9cc6eea67b7ff662ec71ea2329cbb94f8d55404 Bug: 11369303
* | | | | | | | | | am b024bbf6: am 6da66ef4: Merge "Handle screendumps for all framebuffer sizes"Colin Cross2013-10-021-7/+9
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b024bbf6a1daf752a8d756bfda472fe6fb48dd9e': Handle screendumps for all framebuffer sizes
| * | | | | | | | | Merge "Handle screendumps for all framebuffer sizes"Colin Cross2013-10-021-7/+9
| |\ \ \ \ \ \ \ \ \