Mike Lockwood
003771d1c0
am 80d508fd
: Merge "correct VID of Lenovo(0x2006 is for LenovoMobile,0x17EF is for Lenovo)"
...
* commit '80d508fd62a2cc22693a9bbb3aca9bd8568ecec5':
correct VID of Lenovo(0x2006 is for LenovoMobile,0x17EF is for Lenovo)
2011-08-15 10:23:51 -07:00
Mike Lockwood
80d508fd62
Merge "correct VID of Lenovo(0x2006 is for LenovoMobile,0x17EF is for Lenovo)"
2011-08-15 10:07:07 -07:00
zhangclb
c11f99f40a
correct VID of Lenovo(0x2006 is for LenovoMobile,0x17EF is for Lenovo)
...
Change-Id: I3466fdf7b03cf5da189efe4efb563d09f14b467a
2011-08-15 14:18:02 +08:00
JP Abgrall
a88c13bfa9
am f25e55df
: Merge changes I8e33c883,I0a2d1615,I401fc0b4,Ie0fb5b59
...
* commit 'f25e55df1b086161ab28653b583c945df0a16615':
libcutils: qtaguid: support socket untagging, return errors.
Move qtaguid.c from common sources in Android.mk to fix windows build.
Fix header file inclusion for type uid_t.
Add communication support for xt_qtaguid(network traffic accounting) kernel module.
2011-08-10 21:22:27 -07:00
JP Abgrall
f25e55df1b
Merge changes I8e33c883,I0a2d1615,I401fc0b4,Ie0fb5b59
...
* changes:
libcutils: qtaguid: support socket untagging, return errors.
Move qtaguid.c from common sources in Android.mk to fix windows build.
Fix header file inclusion for type uid_t.
Add communication support for xt_qtaguid(network traffic accounting) kernel module.
2011-08-10 21:07:04 -07:00
Ashish Sharma
fa2f985b29
libcutils: qtaguid: support socket untagging, return errors.
...
- Enable and rename qtaguid_tagSocket()
- Add qtaguid_untagSocket()
- Return kernel errors to caller
Change-Id: I8e33c8832b7f6b24ed9081f36ce1ea9ae6b099c0
Signed-off-by: Ashish Sharma <ashishsharma@google.com>
2011-08-10 12:25:11 -07:00
JP Abgrall
8699394639
Move qtaguid.c from common sources in Android.mk to fix windows build.
...
Change-Id: I0a2d1615108b6c10064b3635d05699748a1341a4
2011-08-10 12:24:54 -07:00
Ashish Sharma
13825eb0a3
Fix header file inclusion for type uid_t.
...
Change-Id: I401fc0b41b4b77114fce7240662c9dfe4509e841
2011-08-10 12:23:30 -07:00
Ashish Sharma
60daf104a1
Add communication support for xt_qtaguid(network traffic accounting) kernel module.
...
Change-Id: Ie0fb5b593987c53ee6f906fe6e0caab5a581d5a1
2011-08-10 12:23:25 -07:00
Nick Kralevich
adabe56690
am 810cf41b
: Merge "Fixed memory leak when using transport:serial."
...
* commit '810cf41b6d5b772846bbb16700f8c69f03710e60':
Fixed memory leak when using transport:serial.
2011-07-29 16:44:22 -07:00
Nick Kralevich
810cf41b6d
Merge "Fixed memory leak when using transport:serial."
2011-07-29 16:32:21 -07:00
Tom Marlin
3175c8e9bf
Fixed memory leak when using transport:serial.
...
Fixed memory leak when using transport:serial. Code was previously
using strdup() to make a copy of the serial number which was not
necessary. Instead, just set serial=service.
Change-Id: Ifa8fe7999c6fb88955d2c6bdfcd3cd724ec1f020
Signed-off-by: Tom Marlin <tomm@bsquare.com>
2011-07-29 13:38:56 -05:00
Mike Lockwood
7d39463eff
am d1015de9
: Merge "adb: Add USB vendor ID for Vizio"
...
* commit 'd1015de919308ec0a99643f5b2837774d7a3dc62':
adb: Add USB vendor ID for Vizio
2011-07-29 06:17:57 -07:00
Mike Lockwood
d1015de919
Merge "adb: Add USB vendor ID for Vizio"
2011-07-29 06:01:54 -07:00
Mike Lockwood
fb34e98bdd
adb: Add USB vendor ID for Vizio
...
Change-Id: I280ff83d7f1fda1ed811bd42cb6fd65036525559
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-29 08:59:43 -04:00
Conley Owens
8621b5ea47
am 212282c3
: am 80dbd2a7
: Merge "Fix build error in init when building with bootchart"
...
* commit '212282c314265b1d1def070634049c55291576bb':
Fix build error in init when building with bootchart
2011-07-21 17:51:48 -07:00
Conley Owens
212282c314
am 80dbd2a7
: Merge "Fix build error in init when building with bootchart"
...
* commit '80dbd2a7f277e2fcf831e2ac1b2da574e1513564':
Fix build error in init when building with bootchart
2011-07-21 17:50:01 -07:00
Conley Owens
80dbd2a7f2
Merge "Fix build error in init when building with bootchart"
2011-07-21 17:41:32 -07:00
Mike Lockwood
1f72fe991d
am 7df080b2
: am 3ddaa0ad
: Merge "adb: Add USB vendor ID for Lenovo"
...
* commit '7df080b27921827327952628c46dcea6ae6caf34':
adb: Add USB vendor ID for Lenovo
2011-07-18 09:15:25 -07:00
Mike Lockwood
7df080b279
am 3ddaa0ad
: Merge "adb: Add USB vendor ID for Lenovo"
...
* commit '3ddaa0ad1eea0bd9b8137ccf3f200992f7d98c5a':
adb: Add USB vendor ID for Lenovo
2011-07-18 09:12:05 -07:00
Mike Lockwood
3ddaa0ad1e
Merge "adb: Add USB vendor ID for Lenovo"
2011-07-18 09:08:29 -07:00
Conley Owens
1e5e2d7673
am af6e3266
: am d0b93f43
: Merge "Create world readable, system writeable /data/resource-cache."
...
* commit 'af6e3266fd8d4808a3aa2b37e08dce67493ff396':
Create world readable, system writeable /data/resource-cache.
2011-07-15 11:29:15 -07:00
Conley Owens
af6e3266fd
am d0b93f43
: Merge "Create world readable, system writeable /data/resource-cache."
...
* commit 'd0b93f4317c29d434ce22a2643c165317efc5464':
Create world readable, system writeable /data/resource-cache.
2011-07-15 11:26:47 -07:00
Conley Owens
d0b93f4317
Merge "Create world readable, system writeable /data/resource-cache."
2011-07-15 11:18:56 -07:00
Kenny Root
3ea075bee7
am ca0a6f04
: am 008cbcd0
: Merge "Add -F for classify to ls"
...
* commit 'ca0a6f0493c2b6a4b6ea20b31a37457accdaf126':
Add -F for classify to ls
2011-07-14 17:56:56 -07:00
Kenny Root
ca0a6f0493
am 008cbcd0
: Merge "Add -F for classify to ls"
...
* commit '008cbcd082f21683b3b53d1ca84725b72b2f90b6':
Add -F for classify to ls
2011-07-14 17:54:54 -07:00
Kenny Root
008cbcd082
Merge "Add -F for classify to ls"
2011-07-14 17:41:40 -07:00
Mike Lockwood
7c17d0932c
adb: Add USB vendor ID for Lenovo
...
Change-Id: I1c2423f567272493067fae04e64fdcb651b0af62
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-14 09:00:33 -04:00
Kenny Root
40dac65941
Add -F for classify to ls
...
Adds a field to the non-long version of ls that tells what type of file
it is (i.e., regular, directory, link, fifo, etc).
This is useful for scripts that don't have direct filesystem access.
Change-Id: I54a327390f6ed403acb13c824f62ba9594ba320d
2011-07-13 17:53:50 -07:00
Jean-Baptiste Queru
3415d41107
Merge "resolved conflicts for merge of 8f1f5b06
to gingerbread-plus-aosp" into gingerbread-plus-aosp
2011-07-12 15:01:26 -07:00
Mike Lockwood
a38ec2b7d4
am 4c6b494a
: Merge "adb: Add vendor IDs for iRiver, Compal and T & A Mobile Phones"
...
* commit '4c6b494a109186791bfc421bc10f35eaae871174':
adb: Add vendor IDs for iRiver, Compal and T & A Mobile Phones
2011-07-12 11:59:31 -07:00
Mike Lockwood
7da2397583
am 0dce7d7e
: Merge "Add Gigabyte\'s USB vendor ID to adb."
...
* commit '0dce7d7e7294c3815594f7e561f8df9a858e0fab':
Add Gigabyte's USB vendor ID to adb.
2011-07-12 11:59:30 -07:00
Mike Lockwood
9df11a69e1
am 161fca79
: Merge "Add Funai\'s USB vendor ID to adb."
...
* commit '161fca79a9b79ed15d009fc71a916bf1a3b62621':
Add Funai's USB vendor ID to adb.
2011-07-12 11:59:28 -07:00
Mike Lockwood
4c6b494a10
Merge "adb: Add vendor IDs for iRiver, Compal and T & A Mobile Phones"
2011-07-12 11:53:31 -07:00
Mike Lockwood
0dce7d7e72
Merge "Add Gigabyte's USB vendor ID to adb."
2011-07-12 11:52:50 -07:00
Mike Lockwood
161fca79a9
Merge "Add Funai's USB vendor ID to adb."
2011-07-12 11:52:34 -07:00
David 'Digit' Turner
97814ab2a3
resolved conflicts for merge of 8f1f5b06
to gingerbread-plus-aosp
...
Change-Id: Ie5d26c5a8b31e85aa5137ddbc5eef3616df4fcba
2011-07-12 01:38:41 +02:00
Mike Lockwood
292e86230e
adb: Add vendor IDs for iRiver, Compal and T & A Mobile Phones
...
Change-Id: I4dafc43aa76049dd0075e1d70ba05d899e545c8d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-11 09:39:39 -04:00
Joe Bass
7a5c1463ba
Add Gigabyte's USB vendor ID to adb.
...
Bug #4452872
Change-Id: Ib97548d121d40e96ccc519323a335fc90f3b32b9
2011-07-11 09:39:02 -04:00
Xavier Ducrohet
cbe19cec61
Add Funai's USB vendor ID to adb.
...
Change-Id: Idc2974d4437ab1c79cfea5aade98b599a877aad3
2011-07-11 09:37:43 -04:00
David 'Digit' Turner
8f1f5b061f
merge intel x86 patches into gingerbread branch
2011-07-08 18:19:06 +02:00
Jean-Baptiste Queru
202729a0c1
am 14c2823a
: Merge "add strutils"
...
* commit '14c2823a631b444687b9d26b7baf4c864091c07b':
add strutils
2011-06-20 09:04:35 -07:00
Jean-Baptiste Queru
4c78d86205
am a08f7ae3
: Merge "tweak for forward-compatibility"
...
* commit 'a08f7ae3c10f4874194fb48ff549e846e39217b7':
tweak for forward-compatibility
2011-06-20 09:04:33 -07:00
Jean-Baptiste Queru
14c2823a63
Merge "add strutils"
2011-06-18 11:56:48 -07:00
Jean-Baptiste Queru
89790b8929
add strutils
...
Change-Id: If5938ecd1dfd7f35e326573d10788bacaf3e2383
2011-06-18 11:53:34 -07:00
Jean-Baptiste Queru
a08f7ae3c1
Merge "tweak for forward-compatibility"
2011-06-18 11:21:59 -07:00
Jean-Baptiste Queru
b6c15de82a
tweak for forward-compatibility
...
Change-Id: I1896be16622b452a3652412af3c64f8c550f71d0
2011-06-18 10:41:31 -07:00
Jean-Baptiste Queru
fa3dfff83b
Move mksh to external/mksh
...
Change-Id: I836b8764320bd498c335d97267d8b47acb97514d
2011-06-16 10:06:45 -07:00
David 'Digit' Turner
bb5da05806
pixelflinger: back-port AOSP master version.
...
Pixelflinger doesn't have an x86 JIT, and the generic scanline()
routine is _extremely_ slow. This makes UI performance very slow.
when running full_x86-eng under emulation.
This patch back-ports the AOSP master pixelflinger into the
gingerbread branch. This essentially contains more than a dozen
new "shortcut" scanline functions used to speed-up the pixel
operations that are mostly used with the normal widget UI.
GL applications (e.g. Gallery3D) will still be very slow, but
this makes the home screen, app launcher, settings and many
simple applications work with very usable performance.
Change-Id: Ia64d8dd2e46820f07e98c4c9a4ec831b59fc61e4
2011-06-15 15:09:47 +02:00
Jun Nakajima
0f1b4f37c1
x86: Add vold.fstab to mount the SD card
...
Orig-Change-Id: Ie1f70a22dd4e27e8ea956d5e627877d1e2379b95
Signed-off-by: Jun Nakajima <jun.nakajima@intel.com>
2011-06-15 15:09:46 +02:00