Commit graph

1734 commits

Author SHA1 Message Date
Danica Chang
7002edeb3d Merge "added network.conf to android_filesystem_config" 2010-08-18 16:47:10 -07:00
Carl Shapiro
70e2b183e5 am 703c85c6: am 0c0f68e8: Fix a long standing bug in the output buffer size computation.
Merge commit '703c85c69d3822067623a6dd7bfde4b734c7f84f'

* commit '703c85c69d3822067623a6dd7bfde4b734c7f84f':
  Fix a long standing  bug in the output buffer size computation.
2010-08-18 15:17:28 -07:00
Carl Shapiro
703c85c69d am 0c0f68e8: Fix a long standing bug in the output buffer size computation.
Merge commit '0c0f68e8ff9fb88eaae614d1da316f0037484886' into gingerbread-plus-aosp

* commit '0c0f68e8ff9fb88eaae614d1da316f0037484886':
  Fix a long standing  bug in the output buffer size computation.
2010-08-18 13:38:04 -07:00
Jean-Baptiste Queru
7f7047eb6b am 58b64ace: Revert "- creates proper ifc.h and dhcp.h headers for libnetutils"
Merge commit '58b64acef07e6426914a8cb2d972778fbe138655'

* commit '58b64acef07e6426914a8cb2d972778fbe138655':
  Revert "- creates proper ifc.h and dhcp.h headers for libnetutils"
2010-08-18 13:28:30 -07:00
Jean-Baptiste Queru
58b64acef0 Revert "- creates proper ifc.h and dhcp.h headers for libnetutils"
This reverts commit c88e09cb98.
2010-08-18 11:16:00 -07:00
Carl Shapiro
0c0f68e8ff Fix a long standing bug in the output buffer size computation.
git cherry-pick -e 2a7f2ae7d4
2010-08-17 17:53:35 -07:00
Jean-Baptiste Queru
8fa95f9660 am 838336fa: am 5dfd90e5: Merge "pixelflinger: Fix function naming typo: gglBitBlti"
Merge commit '838336fa61f2f06898322f059570708def823398'

* commit '838336fa61f2f06898322f059570708def823398':
  pixelflinger: Fix function naming typo: gglBitBlti
2010-08-17 07:51:28 -07:00
Jean-Baptiste Queru
aa3061dab6 am 933dc059: am 4ea1a52b: Merge "libpixelflinger: ARMv6 specific objects are not used. Remove."
Merge commit '933dc05929fba064286bd43a7c72c7d4e1775582'

* commit '933dc05929fba064286bd43a7c72c7d4e1775582':
  libpixelflinger: ARMv6 specific objects are not used.  Remove.
2010-08-17 07:51:26 -07:00
Jim Huang
d8e0e26db7 am 7caef0c7: am 6090dacd: libpixelflinger: Move codeflinger test function to test-opengl-codegen
Merge commit '7caef0c70f51a4863969a537c5d5e954483304f6'

* commit '7caef0c70f51a4863969a537c5d5e954483304f6':
  libpixelflinger: Move codeflinger test function to test-opengl-codegen
2010-08-17 07:51:23 -07:00
Jean-Baptiste Queru
838336fa61 am 5dfd90e5: Merge "pixelflinger: Fix function naming typo: gglBitBlti"
Merge commit '5dfd90e5c79774d9981d25ab4defbd1e1f652c34' into gingerbread-plus-aosp

* commit '5dfd90e5c79774d9981d25ab4defbd1e1f652c34':
  pixelflinger: Fix function naming typo: gglBitBlti
2010-08-17 07:48:42 -07:00
Jean-Baptiste Queru
933dc05929 am 4ea1a52b: Merge "libpixelflinger: ARMv6 specific objects are not used. Remove."
Merge commit '4ea1a52b1bbbd6e78c5909c75d773416108f5b84' into gingerbread-plus-aosp

* commit '4ea1a52b1bbbd6e78c5909c75d773416108f5b84':
  libpixelflinger: ARMv6 specific objects are not used.  Remove.
2010-08-17 07:48:41 -07:00
Jim Huang
7caef0c70f am 6090dacd: libpixelflinger: Move codeflinger test function to test-opengl-codegen
Merge commit '6090dacd1894429baaf13f7b30b2f6e9e2c1617f' into gingerbread-plus-aosp

* commit '6090dacd1894429baaf13f7b30b2f6e9e2c1617f':
  libpixelflinger: Move codeflinger test function to test-opengl-codegen
2010-08-17 07:48:36 -07:00
Mike Lockwood
c174b7102e am b1fb9538: am 4553b08d: sdcard: Implement statfs, stat time values and change mount point to /mnt/sdcard
Merge commit 'b1fb953877a08400b90ed1a6078cac5f6b849c98'

* commit 'b1fb953877a08400b90ed1a6078cac5f6b849c98':
  sdcard: Implement statfs, stat time values and change mount point to /mnt/sdcard
2010-08-16 21:34:16 -07:00
Mike Lockwood
b1fb953877 am 4553b08d: sdcard: Implement statfs, stat time values and change mount point to /mnt/sdcard
Merge commit '4553b08d7555a103fdbe8623a9cbd826a7e413ff' into gingerbread-plus-aosp

* commit '4553b08d7555a103fdbe8623a9cbd826a7e413ff':
  sdcard: Implement statfs, stat time values and change mount point to /mnt/sdcard
2010-08-16 21:32:27 -07:00
Mike Lockwood
4553b08d75 sdcard: Implement statfs, stat time values and change mount point to /mnt/sdcard
Change-Id: Iac2c4ec47af7d47d76a82916866ad36782caf25c
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-16 14:16:13 -04:00
Jean-Baptiste Queru
5dfd90e5c7 Merge "pixelflinger: Fix function naming typo: gglBitBlti" 2010-08-16 09:33:04 -07:00
Jean-Baptiste Queru
4ea1a52b1b Merge "libpixelflinger: ARMv6 specific objects are not used. Remove." 2010-08-16 09:25:13 -07:00
Brian Swetland
d06aee5da1 am a8280783: am b14a2c6e: fix up permissions
Merge commit 'a82807839758a58bc16781b2e0ef9bce15677343'

* commit 'a82807839758a58bc16781b2e0ef9bce15677343':
  fix up permissions
2010-08-13 17:23:40 -07:00
Brian Swetland
a828078397 am b14a2c6e: fix up permissions
Merge commit 'b14a2c6e34b197870433386fb809d34b58b30fc0' into gingerbread-plus-aosp

* commit 'b14a2c6e34b197870433386fb809d34b58b30fc0':
  fix up permissions
2010-08-12 18:24:19 -07:00
Brian Swetland
b14a2c6e34 fix up permissions
Change-Id: I93c828ebc755ad2a2055066c8af65dfde7dc7b2e
2010-08-12 18:22:23 -07:00
Brian Swetland
d305c4a24d am 4b2fc45c: am 03ee9479: sdcard: a program to create a "virtual" /sdcard pointed at a path
Merge commit '4b2fc45c151382cdf4b5cc00d9a8a7159378264c'

* commit '4b2fc45c151382cdf4b5cc00d9a8a7159378264c':
  sdcard: a program to create a "virtual" /sdcard pointed at a path
2010-08-12 18:08:04 -07:00
Brian Swetland
4b2fc45c15 am 03ee9479: sdcard: a program to create a "virtual" /sdcard pointed at a path
Merge commit '03ee9479a4ed67689b9bbccda20c60800a38b178' into gingerbread-plus-aosp

* commit '03ee9479a4ed67689b9bbccda20c60800a38b178':
  sdcard: a program to create a "virtual" /sdcard pointed at a path
2010-08-12 18:05:49 -07:00
Danica Chang
78fdd23c92 added network.conf to android_filesystem_config
Change-Id: I393720a2c1632c311f794e14c17b197083a70621
2010-08-12 18:04:57 -07:00
Brian Swetland
03ee9479a4 sdcard: a program to create a "virtual" /sdcard pointed at a path
sdcard is a program that uses FUSE to emulate FAT-on-sdcard style
directory permissions (all files are given fixed owner, group, and
permissions at creation, owner, group, and permissions are not
changeable, symlinks and hardlinks are not createable, etc.

usage: sdcard <path> <uid> <gid>

It must be run as root, but will change to uid/gid as soon as it
mounts a filesystem on /sdcard.  It will refuse to run if uid or
gid are zero.

Change-Id: I9a5d2e5daaebeee632f8470172cbb77b7fa689f8
Signed-off-by: Brian Swetland <swetland@google.com>
2010-08-12 18:01:08 -07:00
Brian Swetland
b17505bf46 am 7b9e7d90: am 8417d698: handle 4096 byte pages if requested via --pagesize
Merge commit '7b9e7d9006d52b78d189abe16c7c2bfe20fcb467'

* commit '7b9e7d9006d52b78d189abe16c7c2bfe20fcb467':
  handle 4096 byte pages if requested via --pagesize
2010-08-11 17:06:34 -07:00
Brian Swetland
7b9e7d9006 am 8417d698: handle 4096 byte pages if requested via --pagesize
Merge commit '8417d698cff733f3c5de08f2fa96b67bf4a9f795' into gingerbread-plus-aosp

* commit '8417d698cff733f3c5de08f2fa96b67bf4a9f795':
  handle 4096 byte pages if requested via --pagesize
2010-08-11 17:01:42 -07:00
Brian Swetland
8417d698cf handle 4096 byte pages if requested via --pagesize
Change-Id: I9299ebeced85dcf5e6e4686b99b28b9786be4f25
Signed-off-by: Brian Swetland <swetland@google.com>
2010-08-11 16:56:49 -07:00
Benoit Goby
d2278638d6 init: Add symlinks to USB character devices
Since we now support USB host mode, devices might get a different device
file depending if other devices are connected on the host port. This
patch creates symlinks to USB character devices that depend on the port
devices are connected to, but not on the order they have been probed.
(e.g. /dev/usb/tty2-1:1.0 -> /dev/ttyUSB0)

Change-Id: I285bcc2d59446fbff8a7abbe39c21781f3bb4bd3
2010-08-10 15:13:07 -07:00
Jim Huang
6e1a9430e8 pixelflinger: Fix function naming typo: gglBitBlti
From the functionality, the function gglBitBlti() implemented bit-block
(image) transfer operation in which several bitmaps are combined into
one using a raster operator.  Renaming to gglBitBlit() should be
explicit.

Change-Id: I23886623b5421131cf7c7bfb8ec67c3809566c93
2010-08-10 02:56:47 +08:00
Jim Huang
9fcaff4621 libpixelflinger: ARMv6 specific objects are not used. Remove.
This patch attempts to remove the generation of libpixelflinger_armv6,
which contains the ARMv6 specific object - rotate90CW_4x4_16v6.o.  But,
libpixelflinger_armv6 is not actually used by other projects.

Change-Id: I0e26fa2cf8b4dacfd208dd4279539c3e5b07580e
2010-08-10 02:18:53 +08:00
Jim Huang
6090dacd18 libpixelflinger: Move codeflinger test function to test-opengl-codegen
There is no need to include codeflinger test function in
libpixelflinger.  Instead, it should exist in test-opengl-codegen.

Change-Id: Ic5b0bd1f754b2ac678d4e16565568c70ceb8d325
2010-08-10 02:07:38 +08:00
Brian Carlstrom
da7723ce90 am 3c659a8d: am f2af88e8: Tracking merge of dalvik-dev to gingerbread
Merge commit '3c659a8d647b2650d83712f9a6724b8ac50ef5ae'

* commit '3c659a8d647b2650d83712f9a6724b8ac50ef5ae':
  Tracking merge of dalvik-dev to gingerbread
2010-08-05 12:10:48 -07:00
Brian Carlstrom
3c659a8d64 am f2af88e8: Tracking merge of dalvik-dev to gingerbread
Merge commit 'f2af88e81af5efb2d585963507f798d5a8b93d67' into gingerbread-plus-aosp

* commit 'f2af88e81af5efb2d585963507f798d5a8b93d67':
  Tracking merge of dalvik-dev to gingerbread
2010-08-05 10:39:18 -07:00
Brian Carlstrom
f2af88e81a Tracking merge of dalvik-dev to gingerbread
git cherry-pick --no-commit b99a099c
git cherry-pick --no-commit 9811671e02
git cherry-pick --no-commit d0645bf0cc

Change-Id: Ie70fecaeaba97a25f114cd2717e381b5107533b1
2010-08-04 15:45:52 -07:00
Iliyan Malchev
e306a9044a Revert "system/core: add system/audio persmissions for /dev/audio*"
This reverts commit 7e8b01229d.
2010-07-30 19:58:31 -07:00
Iliyan Malchev
7e8b01229d system/core: add system/audio persmissions for /dev/audio*
Change-Id: If214241f8150f5ff6cce8b9a76c6c8e5bad9c35a
Signed-off-by: Iliyan Malchev <malchev@google.com>
2010-07-29 17:11:51 -07:00
Jean-Baptiste Queru
30be93c6e2 am 60c8f863: resolved conflicts for merge of 0fcbdb41 to gingerbread-plus-aosp
Merge commit '60c8f863ca84f3e5bb8e78d8001c53511f094d53'

* commit '60c8f863ca84f3e5bb8e78d8001c53511f094d53':
  Userland support for VM interconnection
2010-07-29 15:55:34 -07:00
Jean-Baptiste Queru
60c8f863ca resolved conflicts for merge of 0fcbdb41 to gingerbread-plus-aosp
Change-Id: I1396cd97b28f316849016d55596ad52fffd3235c
2010-07-29 15:53:16 -07:00
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