Andy McFadden
83d11a7ef8
am efca2263: am cc4d11c2: Merge "Fix sim-eng build." into gingerbread
...
Merge commit 'efca22636f4036da32f2f6734926442f5ebb422b'
* commit 'efca22636f4036da32f2f6734926442f5ebb422b':
Fix sim-eng build.
2010-07-01 11:55:54 -07:00
Mike Lockwood
7a96ba436c
libusbhost: The client is now responsible for creating the thread that monitors the bus
...
This is to allow using a thread that is capable of calling through JNI to Java code
to report USB device attached/removed events.
Change-Id: Ia58592607a2c1f4357b31072044f5db5617d7f5b
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-01 11:33:41 -04:00
Andy McFadden
efca22636f
am cc4d11c2: Merge "Fix sim-eng build." into gingerbread
...
Merge commit 'cc4d11c245d5b514ba758cc095a59cd481c92cae' into gingerbread-plus-aosp
* commit 'cc4d11c245d5b514ba758cc095a59cd481c92cae':
Fix sim-eng build.
2010-07-01 07:33:21 -07:00
Andy McFadden
cc4d11c245
Merge "Fix sim-eng build." into gingerbread
2010-07-01 07:30:51 -07:00
Andy McFadden
9f6d28dc45
Fix sim-eng build.
...
Include <stddef.h> to get definition of size_t. Remove inclusion
of <stdint.h>, which doesn't seem to be needed.
Change-Id: Ib7ff231b5ec4b8c672084801fbb294a50cb7c3d7
2010-06-30 22:20:49 -07:00
Werner Johansson
4272a7ad70
am a8c74049: am 931bdcc0: Set explicit timeout on USB control transfer
...
Merge commit 'a8c7404956b4370162a87ae09b851266a4933b54'
* commit 'a8c7404956b4370162a87ae09b851266a4933b54':
Set explicit timeout on USB control transfer
2010-06-30 21:52:19 -07:00
Werner Johansson
a8c7404956
am 931bdcc0: Set explicit timeout on USB control transfer
...
Merge commit '931bdcc09a3d805cf25033951adb95c8e5159e46' into gingerbread-plus-aosp
* commit '931bdcc09a3d805cf25033951adb95c8e5159e46':
Set explicit timeout on USB control transfer
2010-06-30 21:18:54 -07:00
Werner Johansson
931bdcc09a
Set explicit timeout on USB control transfer
...
This attempts to solve the intermittent issues with serial number
showing up as all question marks when issuing "fastboot devices"
2010-06-30 21:03:46 -07:00
Brian Carlstrom
d0645bf0cc
updated BOOTCLASSPATH to track merge from dalvik-dev
...
Change-Id: I10e6895ad3647dd789fe5fc7a7d37c4b71c61717
2010-06-30 00:56:35 -07:00
Mike Lockwood
fe722218dd
Merge "ueventd.rc: Give the USB group read/write access to the MTP USB driver."
2010-06-29 11:59:39 -07:00
Mike Lockwood
69286093d0
ueventd.rc: Give the USB group read/write access to the MTP USB driver.
...
Change-Id: I305671848dbdf427333dc088f83f88cea1b33945
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-29 14:52:20 -04:00
Nick Kralevich
b22fd04b63
Merge "Mount /dev with nosuid"
2010-06-29 08:49:25 -07:00
The Android Open Source Project
e48b78a2b2
am 0e5a6b12: merge from froyo-plus-aosp
...
Merge commit '0e5a6b126ebe3d44ba3ab11664bf8bf92bb953e0'
* commit '0e5a6b126ebe3d44ba3ab11664bf8bf92bb953e0':
Revert "AndroidConfig: define HAVE_PTHREAD_SETNAME_NP"
AndroidConfig: define HAVE_PTHREAD_SETNAME_NP
2010-06-25 14:21:21 -07:00
Kenny Root
45f7fde3c9
am 0b1ff6be: am eb42170e: Display file sizes larger than 2GB correctly
...
Merge commit '0b1ff6be08844c541e36fd735b41990453582ec1'
* commit '0b1ff6be08844c541e36fd735b41990453582ec1':
Display file sizes larger than 2GB correctly
2010-06-25 14:21:11 -07:00
The Android Open Source Project
0e5a6b126e
merge from froyo-plus-aosp
...
Change-Id: I1a3c106234a7910194fe39ca17339796aaf5cfe1
2010-06-25 09:58:37 -07:00
Kenny Root
0b1ff6be08
am eb42170e: Display file sizes larger than 2GB correctly
...
Merge commit 'eb42170e6c8b70f11dca9965785aa04a80290c72' into gingerbread-plus-aosp
* commit 'eb42170e6c8b70f11dca9965785aa04a80290c72':
Display file sizes larger than 2GB correctly
2010-06-25 09:50:08 -07:00
Kenny Root
eb42170e6c
Display file sizes larger than 2GB correctly
...
File size was cast to a signed integer which displayed files over 2GB as
negative sizes on devices. Use a long long for printing instead which
matches the stat struct.
Change-Id: I0ec07f33716bb4c2e5d120633ed435f637238f46
2010-06-25 09:08:05 -07:00
Carl Shapiro
3de5dba559
am 2c4676de: am 93b0cb40: Define inline atomic operations for x86 and ARM.
...
Merge commit '2c4676de62cf8ca7e3759f7f709e29c623495f55'
* commit '2c4676de62cf8ca7e3759f7f709e29c623495f55':
Define inline atomic operations for x86 and ARM.
2010-06-23 14:30:38 -07:00
Carl Shapiro
2c4676de62
am 93b0cb40: Define inline atomic operations for x86 and ARM.
...
Merge commit '93b0cb40c18cae594c931677be2b9214420610b7' into gingerbread-plus-aosp
* commit '93b0cb40c18cae594c931677be2b9214420610b7':
Define inline atomic operations for x86 and ARM.
2010-06-23 14:29:18 -07:00
Carl Shapiro
93b0cb40c1
Define inline atomic operations for x86 and ARM.
...
This change moves the ARM definitions into GCC extended inline
assembler. In addition, the same set of x86 definitions are now
shared among all x86 targets.
Change-Id: I6e5aa3a413d0af2acbe5d32994983d35a01fdcb3
2010-06-23 12:51:26 -07:00
Nick Kralevich
150f19e373
Mount /dev with nosuid
...
Change-Id: I66c7fcf9b65405dfc12d344ef3ed225d0ad2db84
2010-06-22 16:35:43 -07:00
The Android Open Source Project
ec219a2ee7
merge from open-source master
...
Change-Id: I01315984e45ecc0261ea35b5370cbe624cc90cea
2010-06-22 15:30:47 -07:00
Jean-Baptiste Queru
d05d26893d
Revert "AndroidConfig: define HAVE_PTHREAD_SETNAME_NP"
...
This reverts commit de50fc1a87
.
2010-06-22 15:01:31 -07:00
The Android Open Source Project
6d4113f859
merge from open-source master
...
Change-Id: Ibc43e8da821400022726b119940708efb052908b
2010-06-22 14:21:21 -07:00
Andy McFadden
424875b818
Merge "AndroidConfig: define HAVE_PTHREAD_SETNAME_NP"
2010-06-22 13:15:28 -07:00
The Android Open Source Project
fbd0827372
am 67e6fcd1: merge from froyo-plus-aosp
...
Merge commit '67e6fcd19533f54ca37cbe72425f55a40a7f0333'
* commit '67e6fcd19533f54ca37cbe72425f55a40a7f0333':
added vendor ID for http://www.onthegovideo.com/
Fix build - cpu-features is ARM-specific
eliminate a compiler warning: signed/unsigned length
adb: optimize socket-list-walking code
adb: remove unneeded assignment of id to zero
adb: clean up 0 --> NULL for pointers
- creates proper ifc.h and dhcp.h headers for libnetutils
Adds support for UBFX to JIT and Disassembler
2010-06-21 11:52:24 -07:00
The Android Open Source Project
67e6fcd195
merge from froyo-plus-aosp
...
Change-Id: Ie231effb4d9dfd63aa98ec08b269c31ce32aa1c0
2010-06-21 11:50:42 -07:00
Wink Saville
96db405f37
Merge "Update the help text to reflect new capabilities of -b parameter."
2010-06-18 11:29:02 -07:00
Takeshi Kishimoto
9ac7fb7d61
am f1792b3d: am 2124afee: Added NEC and PMC\'s USB VIDs upon their request.
...
Merge commit 'f1792b3d125a6adefa6941d20b3f26833570ab65'
* commit 'f1792b3d125a6adefa6941d20b3f26833570ab65':
Added NEC and PMC's USB VIDs upon their request.
2010-06-18 10:36:46 -07:00
Takeshi Kishimoto
f1792b3d12
am 2124afee: Added NEC and PMC\'s USB VIDs upon their request.
...
Merge commit '2124afeee1f19423e71c52ede6f4926f5389e917' into gingerbread-plus-aosp
* commit '2124afeee1f19423e71c52ede6f4926f5389e917':
Added NEC and PMC's USB VIDs upon their request.
2010-06-18 10:33:13 -07:00
Wink Saville
ba9608ff63
Update the help text to reflect new capabilities of -b parameter.
...
The -b parameter now support specifying multiple ring buffers
and the results are interleaved. In addition a new ring buffer
has been created, 'system', and the default is now -b main -b system.
Change-Id: Ibc25a31fb8fe21d75dda4598a83cf3426f759eb1
2010-06-18 10:15:08 -07:00
Takeshi Kishimoto
2124afeee1
Added NEC and PMC's USB VIDs upon their request.
...
Change-Id: I332ee1e68ff960d41a365aeb96d012253056edd2
2010-06-18 09:37:35 +08:00
Jaikumar Ganesh
5f81c272c1
Move UART device permissions to device specific init files.
...
Change-Id: I548386601d7546831bfeb044d15b1c9bf71f3e96
2010-06-17 13:42:24 -07:00
Mike Lockwood
49a7822ab3
Merge "init.rc: Move SD card support to device specific init.rc files"
2010-06-16 14:37:28 -07:00
Mike Lockwood
a2dffa9db6
init.rc: Move SD card support to device specific init.rc files
...
Change-Id: I5745e91df2b7c5722bd6e650931d3d2d7d0eadcb
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-15 22:48:30 -07:00
Nick Kralevich
4ea0850642
Revert "Mount /dev with noexec and nosuid"
...
This reverts commit 4ec97f2b25
.
2010-06-15 16:57:23 -07:00
The Android Open Source Project
1adbb607d2
merge from open-source master
...
Change-Id: I8cfc9c0b699eceef77a905ca2f8cbdb1ab06bf1d
2010-06-15 11:33:39 -07:00
The Android Open Source Project
2ef569417d
merge from open-source master
...
Change-Id: Ia99df155e4abf0585ed46943b75a2a1569d0534f
2010-06-15 11:31:57 -07:00
The Android Open Source Project
ee0306b933
merge from open-source master
...
Change-Id: I183a933e96222f8c01516210cfa4be5f18e35b70
2010-06-15 11:29:05 -07:00
The Android Open Source Project
d9a1904d3f
merge from open-source master
...
Change-Id: I14853c1f8a1d392d7ee9dfae3914d9ee3107794c
2010-06-15 11:27:36 -07:00
The Android Open Source Project
6f29e5a27b
merge from open-source master
...
Change-Id: I2dacf7f8895debd0452c3601424e32a3b9e19059
2010-06-15 11:26:20 -07:00
The Android Open Source Project
07a804b83a
merge from open-source master
...
Change-Id: Ia8d41f96f3885bd7159571182d09c1da079e5bc9
2010-06-15 11:24:47 -07:00
The Android Open Source Project
f0d644fa23
merge from open-source master
...
Change-Id: I1ec0e1e702687697eccd3bf6c4f115cac85e382c
2010-06-15 11:23:52 -07:00
Jean-Baptiste Queru
177e78efe6
Merge "- creates proper ifc.h and dhcp.h headers for libnetutils - adds ifc_set_hwaddr - adds hwaddr command to netcfg - code reuse: dhcp_configure calls ifc_configure; inet_ntoa is used for printing - consistency: use net.XXX.dnsX properties in favor of dhcp.XXX.dnsX properties (see related change to WifiStateTracker) - updated system/core/nexus to use new headers, although not sure if anybody still uses nexus"
2010-06-15 10:13:30 -07:00
Michael Richardson
83cb93b401
added vendor ID for http://www.onthegovideo.com/
...
Change-Id: I38e3a6f252728d93177745778147e6f6ed45d5c5
2010-06-15 09:33:59 -07:00
Jean-Baptiste Queru
feff3a8b8d
Merge "eliminate a compiler warning: signed/unsigned length"
2010-06-15 09:31:40 -07:00
Jean-Baptiste Queru
7b67993a9e
Merge "adb: optimize socket-list-walking code"
2010-06-15 09:28:26 -07:00
Jean-Baptiste Queru
b660bfc778
Merge "adb: remove unneeded assignment of id to zero"
2010-06-15 09:26:31 -07:00
Jean-Baptiste Queru
1dbfce3dfc
Merge "adb: clean up 0 --> NULL for pointers"
2010-06-15 09:24:23 -07:00
Jean-Baptiste Queru
62f4d86b7c
Fix build - cpu-features is ARM-specific
...
Change-Id: I66521f279545a249e3dcb645914f7b66f23cef21
2010-06-15 08:19:56 -07:00