c0d8fb5842
DO NOT MERGE resolved conflicts for merge of e95aad61 to kraken
...
this change is already in master
Change-Id: Ica43eae28b50d89d50217851aff7e62978abfa27
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-05-17 14:24:36 -04:00
e95aad61d8
merge from open-source master
...
Change-Id: I414c9479f4f913c777ef18b7ff27e410f49d35b9
2010-05-17 08:54:31 -07:00
93ac1559b8
init: Add support for /dev/bus/usb/ file system and add new unix group AID_USB.
...
init now creates files in /dev/bus/usb/ for user access to USB devices.
Files are chmod 660 with group AID_USB.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-05-16 16:04:51 -04:00
c09b7cf1c9
am 509f7399: fastboot: Add more vendor usb ids
2010-05-14 14:52:40 -07:00
509f7399b8
fastboot: Add more vendor usb ids
...
Change-Id: Ied48302b50412f27dcf49d40913e4b900f3bd153
Signed-off-by: Dima Zavin <dima@android.com>
2010-05-14 14:48:39 -07:00
80bdda4235
Merge "Added a move flag for init's mount command that maps to MS_MOVE."
2010-05-14 14:18:43 -07:00
855ddb6231
am 156b9f3d: am 538e5778: merge from open-source master
2010-05-14 13:43:54 -07:00
156b9f3d12
am 538e5778: merge from open-source master
...
Merge commit '538e5778be15382669b0058de5bafa9f4961247e' into kraken
* commit '538e5778be15382669b0058de5bafa9f4961247e':
sys_signame[] was added to libc, remove conflicting definition
2010-05-14 13:40:11 -07:00
538e5778be
merge from open-source master
...
Change-Id: Ia81df7e22e563b01091778043bba65dee1699e83
2010-05-14 13:38:07 -07:00
34ed47a378
Merge "sys_signame[] was added to libc, remove conflicting definition"
2010-05-14 12:34:51 -07:00
fcb44c4e2f
am a523b5b2: Merge "Get rid of warnings when compiled with -Wformat-security" into kraken
2010-05-14 10:11:24 -07:00
a523b5b2ca
Merge "Get rid of warnings when compiled with -Wformat-security" into kraken
2010-05-14 10:08:29 -07:00
40754cfbb0
am 4f55adc3: Get rid of warnings when compiled with -Wformat-security
2010-05-13 16:23:34 -07:00
4f55adc323
Get rid of warnings when compiled with -Wformat-security
...
Change-Id: Ib38b2c152474ed83be1a5716457d0b374c0e5c68
2010-05-13 16:10:23 -07:00
dd26bb3a00
Get rid of warnings when compiled with -Wformat-security
...
Change-Id: I2bfc6582a8198b22af08e4b8d58f532dc138cc02
2010-05-13 15:38:49 -07:00
98c9784d29
Moving junit out of core.jar and into core-junit.jar.
...
Patched from master.
https://android-git.corp.google.com/g/50609
Change-Id: Idbcebbd3ba3599234cf9615b4cf3d38e99d2983f
2010-05-13 15:31:30 -07:00
bc3a04df02
Merge commit '86b121523d7d3634bf5ac07b6e238b36b3e75f0a' into mm
2010-05-13 09:15:11 -07:00
4a8becbf16
Merge "Moving junit out of core.jar and into core-junit.jar."
2010-05-12 22:03:32 -07:00
01e11a1a30
am 0253ffde: am d00eba45: merge from open-source master
2010-05-12 10:57:39 -07:00
0253ffdee4
am d00eba45: merge from open-source master
...
Merge commit 'd00eba458706a38f6c072ed90c5da35f3e3f1bba' into kraken
* commit 'd00eba458706a38f6c072ed90c5da35f3e3f1bba':
Add a printf format.
2010-05-12 10:54:09 -07:00
d00eba4587
merge from open-source master
...
Change-Id: I8e7903bcd3fe7ddf88b63462dc9123f12b779c64
2010-05-12 09:32:54 -07:00
9e3a6d176a
Merge changes Ibe4ce055,I3bcba4c9
...
* changes:
libusbhost: add usb_endpoint_get_device()
adb: remove unnecessary include
2010-05-12 05:56:23 -07:00
5e567cb34b
libusbhost: add usb_endpoint_get_device()
...
Change-Id: Ibe4ce0551faca5d2d8bec0fbd21315a393b9f208
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-05-12 08:53:49 -04:00
e380c27e9f
adb: remove unnecessary include
...
Change-Id: I3bcba4c93834d0ac08bded0f2e3c74984f1f3f54
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-05-12 08:53:27 -04:00
9811671e02
Moving junit out of core.jar and into core-junit.jar.
...
Change-Id: I603cba084c06ddbec21fc88bbaab7cde96952cb1
2010-05-11 20:21:18 -07:00
758582c916
Fix sim build.
...
Change-Id: I6d2af129c2584ef2ea99d038c9cf394de800108b
2010-05-11 14:21:39 -07:00
70b262ad3e
Spell system correctly
...
Change-Id: I3a7b0b8c5c0a3dac23192a32abe88d60ce1f00c0
2010-05-11 13:55:17 -05:00
28a8dab590
Add a printf format.
...
This makes sure that data sent through logwrapper
is interpreted as strings
Change-Id: Ifafa7c3a39433743250aeb76da3c4d9cce05a13f
2010-05-10 14:47:56 -07:00
3db6050d51
Merge commit '253e27acb6c9e3e0b03c59f25cdf9ecbd64bcdad' into mm
2010-05-10 13:03:30 -07:00
e717020da0
Merge "adb: Use new libusbhost library for USB support on Linux host."
2010-05-10 10:37:58 -07:00
8a154aee8d
am 42d38127: Merge "Allow pixelflinger to work when NX (No Execute) is enabled." into kraken
2010-05-10 10:32:22 -07:00
42d38127d2
Merge "Allow pixelflinger to work when NX (No Execute) is enabled." into kraken
2010-05-10 10:28:56 -07:00
cb6d5c1e54
am b20e9851: am 25ffaff6: am 86b12152: fix windows SDK build
2010-05-10 09:53:49 -07:00
b4b7477dfc
am c279d3c5: am 218faa30: am e43c2483: More fixes to Binder perf regression from Eclair
2010-05-10 09:53:46 -07:00
b20e98511d
am 25ffaff6: am 86b12152: fix windows SDK build
...
Merge commit '25ffaff6b1eb8706a893cf255db123d0644b4a7d' into kraken
* commit '25ffaff6b1eb8706a893cf255db123d0644b4a7d':
fix windows SDK build
2010-05-10 09:49:48 -07:00
c279d3c542
am 218faa30: am e43c2483: More fixes to Binder perf regression from Eclair
...
Merge commit '218faa30d547e549c1efbf9bacf23cc56c8bf481' into kraken
* commit '218faa30d547e549c1efbf9bacf23cc56c8bf481':
More fixes to Binder perf regression from Eclair
2010-05-10 09:49:46 -07:00
25ffaff6b1
am 86b12152: fix windows SDK build
...
Merge commit '86b121523d7d3634bf5ac07b6e238b36b3e75f0a' into froyo-plus-aosp
* commit '86b121523d7d3634bf5ac07b6e238b36b3e75f0a':
fix windows SDK build
2010-05-10 09:43:55 -07:00
218faa30d5
am e43c2483: More fixes to Binder perf regression from Eclair
...
Merge commit 'e43c248316d0faa7bdc23de823b068c2aa3520ab' into froyo-plus-aosp
* commit 'e43c248316d0faa7bdc23de823b068c2aa3520ab':
More fixes to Binder perf regression from Eclair
2010-05-10 09:43:44 -07:00
d7249c45f6
adb: Use new libusbhost library for USB support on Linux host.
...
Change-Id: I341e3be0a3eed48b6c5b6559fdbd0e956e2d8fb9
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-05-10 12:10:02 -04:00
30ff2c70ce
libusbhost: new library for Linux USB host support.
...
Supports access to Linux usbdevfs on both device and Linux host.
Change-Id: Ie88a5193be3ee715792b10b34b3da32ffc4ca57b
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-05-10 11:37:26 -04:00
86b121523d
fix windows SDK build
...
Change-Id: I2c563b20197803cafa91214aeff2c06fc0c75580
2010-05-08 11:51:13 -07:00
beeeee705b
Allow pixelflinger to work when NX (No Execute) is enabled.
...
Instead of allocating memory from the (non executable) heap,
allocate memory using mspace and ensure that we use mprotect
to mark it as PROT_EXEC. This allows pixelflinger to
continue to work even when NX protections are enabled.
Testing: Using the ApiDemos market app, verify that
Apidemos -> Graphics -> OpenGL ES -> GLSurfaceView
works when "adb shell setprop debug.egl.hw 0" is set.
Change-Id: Ib569cd2543c6fa25688ee76325a712bc2347450b
2010-05-07 16:35:52 -07:00
e43c248316
More fixes to Binder perf regression from Eclair
...
Re-use the file descriptor to change the cgroups. There's a fast path
in the kernel for the case where the value's already uncahnged. Also,
this is okay because the kernel ignores the write offset. This is
essentially a ioctl-ish/datagram interface, despite being a fd we're
writing to.
This reduces Dalvik->Dalvik void/void Binder calls on Sapphire from
~1.2 to ~0.8 ms. This is a bit slower than the ~0.7 ms we get
avoiding the write altogether.
strace confirms:
[pid 1557] ioctl(21, 0xc0186201 <unfinished ...>
[pid 1556] <... ioctl resumed> , 0x45399cd0) = 0
[pid 1556] write(22, "1556", 4) = 4
[pid 1556] ioctl(21, 0xc0186201 <unfinished ...>
[pid 1555] <... ioctl resumed> , 0x45299cd0) = 0
[pid 1555] write(22, "1555", 4) = 4
[pid 1555] ioctl(21, 0xc0186201 <unfinished ...>
[pid 1554] <... ioctl resumed> , 0x45199cd0) = 0
[pid 1554] write(22, "1554", 4) = 4
BUG=2660235
Change-Id: Ia9f9e1d5b792eaebc9560f89931faf6df0cf9c0d
2010-05-07 15:57:44 -07:00
aebae19598
Merge changes If8e07502,I48c84fab
...
* changes:
Fix adb remount on non-MTD devices
mount: Add support for remounting without specifying device
2010-05-07 13:25:01 -07:00
c880ee0265
Fix adb remount on non-MTD devices
...
Change-Id: If8e07502bcface53aaac81022f6183c6a147edc8
2010-05-07 12:09:27 -07:00
4e7dd3d270
mount: Add support for remounting without specifying device
...
Change-Id: I48c84fab3ab2a9704ec5b7bf7002b8960fa53c27
2010-05-07 12:09:19 -07:00
63b15a3249
Merge "Let "adb connect" connect to emulators too - adb can now connect to an emulator configured with an arbitrary pair of <console port, adb port>. These two ports do not have to be adjacent. This can be done from the commandline at any time using adb connect emu:<console_port>,<adb_port> - Emulators running on ports outside the normal range (5554/5555-5584/5585) register themselves on startup if they follow the convention "console port+1==abd port". - Emulators outside the normal port range will not be auto-detected on adb startup as these ports are not probed. - The index into local_transports[] array in transport_local.c does no longer indicate the port number of the local transport. Use the altered atransport struct to get the port number. - I have chosen not to document the adb connect emu:console_port,adb_port syntax on adb's help screen as this might be confusing to most readers and useful to very few. - I don't expect this to introduce any (backwards) compatibility issues."
2010-05-07 11:04:06 -07:00
879263ce75
am 7f2ad58a: adb: Add Qualcomm USB id
2010-05-07 10:53:14 -07:00
7f2ad58a6d
adb: Add Qualcomm USB id
...
Change-Id: I044a77f14d7a90e9dff191919e4aeb39723ea429
Signed-off-by: Dima Zavin <dima@android.com>
2010-05-07 10:05:21 -07:00
714828be46
Merge commit '458f06335a73438865bf633aeff399cbaedb71e1' into mm
2010-05-06 19:58:34 -07:00
Mike Lockwood