Colin Cross
d8f74f1b3e
am 491ecd0b: Merge changes 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
2014-01-06 12:23:30 -08:00
DanielMo
c1b6b153dc
adb: Add USB vendor ID for YotaDevices
...
Change-Id: Id8bec8a35edd0d21ae52e8469f7a65b5f4433bc2
Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
2014-01-06 12:16:40 -08:00
DanielMo
402c2b9888
adb: Add USB vendor ID for TechFaith
...
Change-Id: Ied42e4d011b736ee990ed75e7d81bc6a16db47f9
2014-01-06 12:16:40 -08:00
DanielMo
d0057c006b
adb: Add USB vendor ID for Rockchip
...
Change-Id: Iea3f7cc6ed463684fe30a73c39445b3ca36854d9
Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
2014-01-06 12:16:39 -08:00
DanielMo
fdd189c64e
adb: Add USB vendor ID for EMERGING Technology (Holdings) Ltd.
...
Change-Id: Ic7f7c984db19050d2ce4da8ae87683ce42dc9094
Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
2014-01-06 12:16:39 -08:00
DanielMo
63f0f5117b
adb: Add USB vendor ID for Allwinner
...
Change-Id: Ic77d5f71c9e329e33cd31fa0854e692ad794a609
Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
2014-01-06 12:16:39 -08:00
DanielMo
d5dab6d5f8
adb: Add USB vendor ID for Amlogic
...
Change-Id: I35fad82214f2b5a82b0150821326aaea15784de1
Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
2014-01-06 12:16:39 -08:00
Volker Moesker
319d8c1d1f
added Gigaset's USB vendor ID
...
Change-Id: Iebb0f352eec4530ee1e972527fc76bbb9dad5cc3
Signed-off-by: Volker Moesker <volker.moesker@gigaset.com>
2014-01-06 12:16:29 -08:00
Colin Cross
293717c364
adb: alphabetically sort usb vendors lists
...
Sort the lists of usb vendor ids alphabetically to reduce future
conflicts.
Change-Id: I682c18a1d97adf3a4aa9c00de9fed932c83e4646
2014-01-06 12:12:39 -08:00
Colin Cross
4600d80cef
am e1095e1d: Merge "Modify BYD\'s USB Vendor ID"
...
* commit 'e1095e1da12de9d6dc219f497f7c19d1c1f7a41b':
Modify BYD's USB Vendor ID
2014-01-03 12:58:31 -08:00
Colin Cross
e1095e1da1
Merge "Modify BYD's USB Vendor ID"
2014-01-03 20:53:22 +00:00
Nick Kralevich
8be1ccff87
am fcf3d207: Merge "adb: configure /system file permission with fs_config"
...
* commit 'fcf3d207c51f1e734137a08ae2fdb1bb37a50b87':
adb: configure /system file permission with fs_config
2014-01-03 11:04:02 -08:00
Liang Cheng
20d33f4d99
adb: configure /system file permission with fs_config
...
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
2014-01-02 20:26:18 -08:00
Nick Kralevich
98fdcfa981
am 67cb61ee: Merge "adb: Check sender\'s socket id when receiving packets."
...
* commit '67cb61ee5a8b8f5c967361430fff250e76c3a1dc':
adb: Check sender's socket id when receiving packets.
2013-12-19 10:38:02 -08:00
David 'Digit' Turner
818d641c42
adb: Check sender's socket id when receiving packets.
...
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
2013-12-16 17:58:08 +01:00
Nick Kralevich
a91a47c30c
am b2dfa7ec: am 02d90b92: am 33e7f915: am 54a80bcf: am cd072e94: am ba104fb7: am e975716e: am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client
...
* commit 'b2dfa7ece7fb69d2ce5ae517eb35492beb646385':
Fix overflow in adb_client
2013-12-10 12:42:20 -08:00
Nick Kralevich
b2dfa7ece7
am 02d90b92: am 33e7f915: am 54a80bcf: am cd072e94: am ba104fb7: am e975716e: am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client
...
* commit '02d90b92ce65ad4e7f49565f0e97373e1d8b0fbf':
Fix overflow in adb_client
2013-12-10 12:39:32 -08:00
Nick Kralevich
02d90b92ce
am 33e7f915: am 54a80bcf: am cd072e94: am ba104fb7: am e975716e: am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client
...
* commit '33e7f915d6a27880dd4c4c0709dcc921f549eea2':
Fix overflow in adb_client
2013-12-10 12:37:32 -08:00
Nick Kralevich
33e7f915d6
am 54a80bcf: am cd072e94: am ba104fb7: am e975716e: am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client
...
* commit '54a80bcf88060b21f527c631c7ec911171bdb13f':
Fix overflow in adb_client
2013-12-10 12:31:17 -08:00
Nick Kralevich
54a80bcf88
am cd072e94: am ba104fb7: am e975716e: am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client
...
* commit 'cd072e94cf7e546cd6d333cd65641edcd69402b7':
Fix overflow in adb_client
2013-12-10 12:29:05 -08:00
Nick Kralevich
03d4eb2900
am d63fb078: am e89e09dd: Fix overflow in adb_client
...
* commit 'd63fb078aea697c536b19c03d29d4dde4ac087fc':
Fix overflow in adb_client
2013-12-10 12:17:45 -08:00
Nick Kralevich
d63fb078ae
am e89e09dd: Fix overflow in adb_client
...
* commit 'e89e09dd2b9b42184973e3ade291186a2737bced':
Fix overflow in adb_client
2013-12-10 12:14:44 -08:00
Nick Kralevich
e89e09dd2b
Fix overflow in adb_client
...
Change-Id: I7f8582bd8a69d61ce47d11a9ffd0e901fc371037
Credit: Joshua Drake
Bug: 12060953
2013-12-10 10:18:10 -08:00
Elliott Hughes
9259663cdb
am f17f5591: am 36d44740: Merge "Fix a bunch of small system/core bugs."
...
* commit 'f17f55914e18eb176ccc5bb8266b248ece8cb56b':
Fix a bunch of small system/core bugs.
2013-10-29 18:31:01 -07:00
Elliott Hughes
14e28d39f7
Fix a bunch of small system/core bugs.
...
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
2013-10-29 14:12:46 -07:00
Brian Carlstrom
406abdc8a2
am 5dadac50: am 87af04a4: Merge "Improve some adb error logging"
...
* commit '5dadac50c4bbeaf8baf4d5e04c2d2706d9e74fc7':
Improve some adb error logging
2013-10-28 14:30:26 -07:00
Brian Carlstrom
93c91fad77
Improve some adb error logging
...
Bug: 11290643
Change-Id: Ibad4e9f0b69421cd6017b70a52237e7f27aab848
2013-10-27 16:56:55 -07:00
Nick Kralevich
0bf7924df1
am 91704522: Don\'t return immediately from reboot commands.
...
* commit '917045222a69021eb36aea96708649c709685509':
Don't return immediately from reboot commands.
2013-10-24 12:39:29 -07:00
Nick Kralevich
917045222a
Don't return immediately from reboot commands.
...
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
2013-10-24 11:01:16 -07:00
Colin Cross
903e6865ca
am b024bbf6: am 6da66ef4: Merge "Handle screendumps for all framebuffer sizes"
...
* commit 'b024bbf6a1daf752a8d756bfda472fe6fb48dd9e':
Handle screendumps for all framebuffer sizes
2013-10-02 14:31:46 -07:00
Colin Cross
6da66ef49b
Merge "Handle screendumps for all framebuffer sizes"
2013-10-02 20:24:46 +00:00
Doug Zongker
8e5b63d045
mincrypt: support SHA-256 hash algorithm
...
- adds a library to compute the SHA-256 hash
- updates the RSA verifier to take an argument specifying either SHA-1
or SHA-256
- updates DumpPublicKey to with new "key" version numbers for
specifying SHA-256
- adds new argument to adb auth code to maintain existing behavior
(cherry picked from commit 515e1639ef
)
Change-Id: Ib35643b3d864742e817ac6e725499b451e45afcf
2013-09-25 09:26:34 -07:00
Chris Dearman
85373f4280
Handle screendumps for all framebuffer sizes
...
readx() treats a partial read as an error but also consumes the data,
Now exactly the amount of data needed for the screendump is requested.
This bug showed up for framebuffers that were not a multiple of 640
bytes.
Also fix a compiler warning related to handing pipe() failure.
Change-Id: I8b1713923e156d4e3424784152e5dc5cbc7d478d
2013-09-25 02:43:45 -07:00
Elliott Hughes
b926493417
am 876f4366: am a7f6e015: Merge "correct msi usb vendor id."
...
* commit '876f436668036e8e9d3f86434eee1a44ff5364b8':
correct msi usb vendor id.
2013-08-28 08:37:02 -07:00
astonehuang
48c5d7b6cd
correct msi usb vendor id.
...
Change-Id: I13128531b8dd7758abddce47ce1c119381773c26
2013-08-28 10:53:17 +08:00
Elliott Hughes
88ea2f669f
am 3042c265: am b3644d8f: Merge "Add USB Vendor ID for WACOM"
...
* commit '3042c265bf3123426e99fed856c9d3b7fa3b3ad6':
Add USB Vendor ID for WACOM
2013-08-16 15:37:43 -07:00
Wing Tseng
64a602942e
Add USB Vendor ID for WACOM
...
Change-Id: I3deee6d5bdfb9c5bbc0fddcfa39814d27ee281c2
Signed-off-by: Wing Tseng <Wing_Tseng@pegatroncorp.com>
2013-08-15 09:33:59 +08:00
Elliott Hughes
49f2e1cedf
am cc39d421: am 936032b4: Merge "Add USB Vendor ID for MSI"
...
* commit 'cc39d421ea5f449d5e201dd1ada7b2a12acf5ad9':
Add USB Vendor ID for MSI
2013-08-12 10:34:58 -07:00
astonehuang
307d96a6e6
Add USB Vendor ID for MSI
...
Change-Id: I4f4bfb6ef08058bf749917119a2b08952e7bc337
2013-08-01 15:23:17 +08:00
Colin Cross
44f5c15724
Merge "Move liblog headers to system/core/include/log"
2013-07-25 21:39:24 +00:00
Elliott Hughes
b815810f47
am 09f240e0: am 5d855432: Merge "Add USB Vendor ID for ECS"
...
* commit '09f240e0b06326531e64e9826859a774cd456ad7':
Add USB Vendor ID for ECS
2013-07-25 09:58:12 -07:00
Elliott Hughes
5d8554323c
Merge "Add USB Vendor ID for ECS"
2013-07-25 16:50:39 +00:00
Colin Cross
9227bd3855
Move liblog headers to system/core/include/log
...
Move the liblog headers to log/ instead of cutils/ to complete
the separation of libcutils and liblog. cutils/log.h still
exists and includes log/log.h in order to support the many existing
modules that use cutils/log.h.
Change-Id: I2758c9f4aedcb809ca7ba8383d0f55041dd44345
2013-07-24 12:32:39 -07:00
ecsgms
cae8b9df5c
Add USB Vendor ID for ECS
...
Change-Id: Ib2fa70204d37f53dc642091eb927d865ddc585b5
2013-07-24 16:13:49 +08:00
Elliott Hughes
228ee639be
am 98c02528: am 19188955: am d92e35eb: Merge "Add Qisda usb config"
...
* commit '98c02528a2f8bdc0f31a78a8b0b086f4ae823310':
Add Qisda usb config
2013-06-18 11:37:47 -07:00
Elliott Hughes
19188955b5
am d92e35eb: Merge "Add Qisda usb config"
...
* commit 'd92e35eb7b97f349054390cfee1d40154dba6d66':
Add Qisda usb config
2013-06-18 11:32:58 -07:00
esther
001fe87e02
Add Qisda usb config
...
add Qisda usb config
Signed-off-by: esther <esther530@gmail.com>
Change-Id: I5b8a0e5bd2218ecdf417de357c9a7d9307c91932
Conflicts:
adb/usb_vendors.c
2013-06-18 11:28:08 -07:00
Elliott Hughes
e39057b687
am 88411498: am 520f4f06: am 865bb05d: Merge "adb: fix reported transfer size for transfer over 4 GiB"
...
* commit '88411498b3341dbf8f2976991524b1e21dedc6f6':
adb: fix reported transfer size for transfer over 4 GiB
2013-06-17 14:00:17 -07:00
Elliott Hughes
8df29c9b61
am 1aeefcd6: am 0173ebd5: am 5f8d9c01: Merge "adb: add vendor ID\'s for Nook, Haier, Hisense, and MTK"
...
* commit '1aeefcd6900d85911028e6d3e344e338e0a05158':
adb: add vendor ID's for Nook, Haier, Hisense, and MTK
2013-06-17 13:56:54 -07:00
Elliott Hughes
520f4f0603
am 865bb05d: Merge "adb: fix reported transfer size for transfer over 4 GiB"
...
* commit '865bb05dd0db1531f252de5e137605beec171ca2':
adb: fix reported transfer size for transfer over 4 GiB
2013-06-17 13:56:04 -07:00