Jean-Baptiste Queru
0fcbdb4147
Merge "Userland support for VM interconnection"
2010-07-29 15:04:57 -07:00
Jean-Baptiste Queru
69f2d3ce91
am 42b871f1: am c37ba1c9: Merge "Check fastboot oem command line length"
...
Merge commit '42b871f1bfc116d53d1bff9d7497415494b2e0e0'
* commit '42b871f1bfc116d53d1bff9d7497415494b2e0e0':
Check fastboot oem command line length
2010-07-29 11:11:07 -07:00
Jean-Baptiste Queru
42b871f1bf
am c37ba1c9: Merge "Check fastboot oem command line length"
...
Merge commit 'c37ba1c916d73fbf35c6faba1e252e2916d2d41d' into gingerbread-plus-aosp
* commit 'c37ba1c916d73fbf35c6faba1e252e2916d2d41d':
Check fastboot oem command line length
2010-07-29 11:08:02 -07:00
Jean-Baptiste Queru
c37ba1c916
Merge "Check fastboot oem command line length"
2010-07-29 11:00:02 -07:00
Mike Lockwood
e1de544555
Merge "libusbhost: add usb_device_get_unique_id_from_name()"
2010-07-27 16:11:38 -07:00
Mike Lockwood
07eb4af174
libusbhost: add usb_device_get_unique_id_from_name()
...
Change-Id: Idce54fc26d0432d4dc46f605623c4960c0e8690f
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-27 19:05:33 -04:00
Kenny Root
7a58bcfb1e
am 331eb52d: am 5a0adf95: Merge "Add basic lsof command" into gingerbread
...
Merge commit '331eb52d611de6bd2e70a2b0bde1f3c3733ce657'
* commit '331eb52d611de6bd2e70a2b0bde1f3c3733ce657':
Add basic lsof command
2010-07-27 13:02:58 -07:00
Kenny Root
331eb52d61
am 5a0adf95: Merge "Add basic lsof command" into gingerbread
...
Merge commit '5a0adf95b1170d3d9ec91b0106662cd17514f0e4' into gingerbread-plus-aosp
* commit '5a0adf95b1170d3d9ec91b0106662cd17514f0e4':
Add basic lsof command
2010-07-27 13:00:58 -07:00
Kenny Root
5a0adf95b1
Merge "Add basic lsof command" into gingerbread
2010-07-27 12:58:23 -07:00
Irfan Sheriff
c2424504b6
Merge "Update eventlog tags for WifiStateTracker"
2010-07-27 12:02:04 -07:00
Kenny Root
2d392f24b8
am 65757da0: am 53308d4c: Correct copyright header for uptime and NOTICE
...
Merge commit '65757da0c99cb4b49e1dc9e21facc7b4e67192cd'
* commit '65757da0c99cb4b49e1dc9e21facc7b4e67192cd':
Correct copyright header for uptime and NOTICE
2010-07-27 11:41:50 -07:00
Kenny Root
65757da0c9
am 53308d4c: Correct copyright header for uptime and NOTICE
...
Merge commit '53308d4cd5c4414402e979a6771f7ef3b35f5c2f' into gingerbread-plus-aosp
* commit '53308d4cd5c4414402e979a6771f7ef3b35f5c2f':
Correct copyright header for uptime and NOTICE
2010-07-27 11:39:19 -07:00
Kenny Root
53308d4cd5
Correct copyright header for uptime and NOTICE
...
Change-Id: I89f91c21db87955b20b1ef9b4590f7009f106b26
2010-07-27 11:26:06 -07:00
Kenny Root
8b9b105bc7
Add basic lsof command
...
Basic "list open files" command.
Supports reading all processes for their "exe", "cwd", "root", and "fd"
entries.
Change-Id: I2e2f0911dd65a1993aa1ce9f51222bf264a9d68d
2010-07-27 11:22:20 -07:00
aimitakeshi
e572d596b3
- Add drm and drmio service
...
- Add /data/drm directory for storing DRM related data
Change-Id: Ifd8922a3de109dbf5cd3f9cabbf4e5689b16c1d7
2010-07-27 08:38:35 +09:00
Mike Lockwood
cb0d07b0e0
Merge "libusbhost: Add usb_device_send_control for sending raw commands on endpoint 0."
2010-07-24 11:56:15 -07:00
Mike Lockwood
1b7d991b43
libusbhost: Add usb_device_send_control for sending raw commands on endpoint 0.
...
Change-Id: If883f2690c4031b9ba4d5cf943b5bf5c13193bce
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-24 13:57:57 -04:00
Irfan Sheriff
efc69582fe
Update eventlog tags for WifiStateTracker
...
Change-Id: I43137ba87df7ec30f068997c86957e6bda14aaeb
2010-07-23 15:58:58 -07:00
Bruce Beare
d16de9fd2e
am 1298bb79: am 96a2bb62: Set the modes for rc.* files in /system/etc
...
Merge commit '1298bb79938cb1f4cf920433b86716bd4108de0f'
* commit '1298bb79938cb1f4cf920433b86716bd4108de0f':
Set the modes for rc.* files in /system/etc
2010-07-23 11:06:35 -07:00
Bruce Beare
1298bb7993
am 96a2bb62: Set the modes for rc.* files in /system/etc
...
Merge commit '96a2bb622d38f3c875997e4cacb423fa9ef4ea76' into gingerbread-plus-aosp
* commit '96a2bb622d38f3c875997e4cacb423fa9ef4ea76':
Set the modes for rc.* files in /system/etc
2010-07-23 11:04:38 -07:00
Bruce Beare
96a2bb622d
Set the modes for rc.* files in /system/etc
...
Change-Id: I0897897cdffa66afa4f818f7ebcf0a9b70c517ea
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2010-07-23 10:52:32 -07:00
Nick Pelly
8137a8d941
Merge "Allow OSX fastboot to work with more devices."
2010-07-22 15:49:43 -07:00
Jack Palevich
668f7dc61f
Merge "Set LOCAL_MODULE_TAGS := optional, to save space in system.img."
2010-07-22 14:06:12 -07:00
Shih-wei Liao
3d6ee5d029
Set LOCAL_MODULE_TAGS := optional, to save space in system.img.
...
Change-Id: I3de6564d913f56f459a717a1010311826e3f527f
2010-07-22 11:23:16 -07:00
Nick Pelly
286d50fe34
Allow OSX fastboot to work with more devices.
...
ClearPipeStallBothEnds() appears to fail on some devices, but if we ignore
that error then fastboot does work. So ignore the error.
Change-Id: Ic866ece28a57c081e34079e1a032fa8155301ddf
2010-07-22 10:59:55 -07:00
Jean-Baptiste Queru
93d672cc06
am 1ab3d67f: am 315c3a74: Merge "libsysutils: reimplement NetlinkEvent::findParam in the proper way"
...
Merge commit '1ab3d67f534943018067e2db18a6377404138f52'
* commit '1ab3d67f534943018067e2db18a6377404138f52':
libsysutils: reimplement NetlinkEvent::findParam in the proper way
2010-07-22 09:55:44 -07:00
Jean-Baptiste Queru
1ab3d67f53
am 315c3a74: Merge "libsysutils: reimplement NetlinkEvent::findParam in the proper way"
...
Merge commit '315c3a74a1fcf1d421ffff0857f998a98a1c224a' into gingerbread-plus-aosp
* commit '315c3a74a1fcf1d421ffff0857f998a98a1c224a':
libsysutils: reimplement NetlinkEvent::findParam in the proper way
2010-07-22 09:53:28 -07:00
Jean-Baptiste Queru
315c3a74a1
Merge "libsysutils: reimplement NetlinkEvent::findParam in the proper way"
2010-07-22 09:44:36 -07:00
Takeshi Kishimoto
90ea28e351
am 9060ebb5: am 91c38539: Added Toshiba\'s USB VID (0x0930) upon their request.
...
Merge commit '9060ebb5f7f1b9d979e6ac32e32c719452583363'
* commit '9060ebb5f7f1b9d979e6ac32e32c719452583363':
Added Toshiba's USB VID (0x0930) upon their request.
2010-07-22 09:22:16 -07:00
The Android Open Source Project
aee3acd9e4
am ef582bdb: merge from open-source master
...
Merge commit 'ef582bdb8f24197caf921af7bf7ee63503626cdd'
* commit 'ef582bdb8f24197caf921af7bf7ee63503626cdd':
Added NEC and PMC's USB VIDs upon their request.
2010-07-22 09:20:31 -07:00
Takeshi Kishimoto
9060ebb5f7
am 91c38539: Added Toshiba\'s USB VID (0x0930) upon their request.
...
Merge commit '91c3853911ab23728728728276a21dc6fe5fd622' into gingerbread-plus-aosp
* commit '91c3853911ab23728728728276a21dc6fe5fd622':
Added Toshiba's USB VID (0x0930) upon their request.
2010-07-22 09:14:18 -07:00
The Android Open Source Project
ef582bdb8f
merge from open-source master
...
Change-Id: Iaf64136785853002b44ea59759d57816f943096a
2010-07-22 09:12:15 -07:00
Takeshi Kishimoto
91c3853911
Added Toshiba's USB VID (0x0930) upon their request.
...
Change-Id: I9f7fca6b98b0664ef9af4f7b86f0f5863e91e4c1
2010-07-21 10:21:05 -07:00
Takeshi Kishimoto
81fbbc2d0b
Added NEC and PMC's USB VIDs upon their request.
...
Change-Id: I332ee1e68ff960d41a365aeb96d012253056edd2
2010-07-21 10:20:54 -07:00
Xavier Ducrohet
29a96aff5f
am deafd15f: am 4309d602: Merge "Added Toshiba\'s USB VID (0x0930) upon their request." into gingerbread
...
Merge commit 'deafd15f2c3ee7c7356634787c8463e1f5f937d3'
* commit 'deafd15f2c3ee7c7356634787c8463e1f5f937d3':
Added Toshiba's USB VID (0x0930) upon their request.
2010-07-20 23:58:13 -07:00
Xavier Ducrohet
deafd15f2c
am 4309d602: Merge "Added Toshiba\'s USB VID (0x0930) upon their request." into gingerbread
...
Merge commit '4309d602b562eb9f181b0314837e6096577c6c18' into gingerbread-plus-aosp
* commit '4309d602b562eb9f181b0314837e6096577c6c18':
Added Toshiba's USB VID (0x0930) upon their request.
2010-07-20 23:55:42 -07:00
Xavier Ducrohet
4309d602b5
Merge "Added Toshiba's USB VID (0x0930) upon their request." into gingerbread
2010-07-20 18:01:02 -07:00
Mike Lockwood
e8849d190a
libusbhost: Fix deadlock on devices without USB host support.
...
Change-Id: Ic91f99d1169fcdc00474dd6a870eb7e614128bc2
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-20 16:31:42 -04:00
Nick Kralevich
72f3a00cc7
am 3fc108ac: am fad7204e: resolved conflicts for merge of 5f5d5c8c
to gingerbread
...
Merge commit '3fc108acf2b05153489730178c85b8db94f603af'
* commit '3fc108acf2b05153489730178c85b8db94f603af':
validate the source of uevent messages
2010-07-20 10:48:18 -07:00
Nick Kralevich
3fc108acf2
am fad7204e: resolved conflicts for merge of 5f5d5c8c
to gingerbread
...
Merge commit 'fad7204e9eac20a87afacd7547ed8202a39319f8' into gingerbread-plus-aosp
* commit 'fad7204e9eac20a87afacd7547ed8202a39319f8':
validate the source of uevent messages
2010-07-20 10:45:06 -07:00
The Android Open Source Project
f0a66c807b
am 3c5581da: merge from open-source master
...
Merge commit '3c5581da1d58d0b7e3bac0f03d7ec1e63d71b86d'
* commit '3c5581da1d58d0b7e3bac0f03d7ec1e63d71b86d':
print msg.command in human-readable format
2010-07-20 10:26:45 -07:00
The Android Open Source Project
4984f54c4c
am 02565fec: merge from open-source master
...
Merge commit '02565fec8240bbff105f285e9e25aade52c15450'
* commit '02565fec8240bbff105f285e9e25aade52c15450':
Fix ADB daemon file descriptor leak
2010-07-20 10:16:40 -07:00
The Android Open Source Project
3c5581da1d
merge from open-source master
...
Change-Id: I90bd618ff8c6bcbe1071468e0d75574feee58d27
2010-07-20 10:11:46 -07:00
The Android Open Source Project
02565fec82
merge from open-source master
...
Change-Id: Ice679e12b8393621b21a8dafe640dd880a09d35e
2010-07-20 10:11:20 -07:00
Mike Lockwood
a805519cee
libusbhost: Add callback to usb_host_run to notify when initial device discovery is done
...
This can be used to eliminate race conditions in clients that operate immediately
on the currently connected device list.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Change-Id: I14954b9fcc84239950ead6bdc1a0a888882c2226
2010-07-20 09:50:56 -04:00
Takeshi Kishimoto
29837f94b5
Added Toshiba's USB VID (0x0930) upon their request.
...
Change-Id: I9f7fca6b98b0664ef9af4f7b86f0f5863e91e4c1
2010-07-20 17:08:09 +08:00
Nick Kralevich
fad7204e9e
resolved conflicts for merge of 5f5d5c8c
to gingerbread
...
Change-Id: Ieee2cd67d33f3e774fcfd96f8a5f67a0374aa873
2010-07-19 15:53:05 -07:00
Viral Mehta
899913f816
print msg.command in human-readable format
...
to print msg.command as some odd decimal number is just not helping in debugging;
instead print msg.command as a string
Change-Id: Id1ec770c20c86b8bdae40a0262bf4b63c0213b0a
2010-07-19 15:28:22 -07:00
Jean-Baptiste Queru
fdb13f7937
Merge "Fix ADB daemon file descriptor leak"
2010-07-19 15:23:44 -07:00
Nick Kralevich
5f5d5c8cef
validate the source of uevent messages
...
Bug: 2844206
Change-Id: If2eee54181abfc6c7fda0232f98fa6bb5d12c60c
2010-07-19 14:54:50 -07:00