The Android Open Source Project
aa63e196b4
Reconcile with gingerbread-release
...
Change-Id: Iaef69ddb901f908564167a085c93e91298ce61d4
2011-07-18 08:10:22 -07:00
Conley Owens
4a2b0fcd6e
am aa4a66a1
: am 1e5e2d76
: am af6e3266
: am d0b93f43
: Merge "Create world readable, system writeable /data/resource-cache."
...
* commit 'aa4a66a16dd9b97fb876bb296366442b8745a10b':
Create world readable, system writeable /data/resource-cache.
2011-07-15 14:12:23 -07:00
Kenny Root
81231596c5
am 070ec8e0
: resolved conflicts for merge of 3ea075be
to honeycomb-plus-aosp
...
* commit '070ec8e02e12aafc8a636737bba3d5ead7cecd8e':
Add -F for classify to ls
2011-07-15 14:12:18 -07:00
Conley Owens
aa4a66a16d
am 1e5e2d76
: am af6e3266
: am d0b93f43
: Merge "Create world readable, system writeable /data/resource-cache."
...
* commit '1e5e2d7673a9ea915283f6626fa692cc169b0e67':
Create world readable, system writeable /data/resource-cache.
2011-07-15 11:30:44 -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
Kenny Root
070ec8e02e
resolved conflicts for merge of 3ea075be
to honeycomb-plus-aosp
...
Change-Id: Ic668cb99822d4bc44f2f57782afd1a6c1b348e9b
2011-07-15 11:20:14 -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
Jeff Brown
5fd94e561f
Merge "Show why umount failed."
2011-07-14 16:51:57 -07:00
Jeff Brown
baf6b6bdeb
Show why umount failed.
...
Change-Id: Id2b3fbc46b8dfbe2f05637fb35c298915cd5f524
2011-07-14 13:43:57 -07:00
Jean-Baptiste Queru
2210a83756
am 51ca95dc
: am 3415d411
: Merge "resolved conflicts for merge of 8f1f5b06
to gingerbread-plus-aosp" into gingerbread-plus-aosp
...
* commit '51ca95dc08a411b7973b5d0626e43f8ba0753370':
pixelflinger: back-port AOSP master version.
x86: Add vold.fstab to mount the SD card
Assembly coded android_memset16 and android_memset32
debuggerd: IA version
debuggerd: Reorganize to facilitate IA commit
Set the modes for rc.* files in /system/etc
DBUS is not fully implemented. Disable it for now
debuggerd: Show function names in tombstone backtraces
2011-07-14 10:49:28 -07:00
Jean-Baptiste Queru
7076831c7d
am f75a2ed2
: Merge from gingerbread-plus-aosp
...
* commit 'f75a2ed2138cd8b74597bd57e13d12e1f0b815c2':
adb: Add vendor IDs for iRiver, Compal and T & A Mobile Phones
Add Gigabyte's USB vendor ID to adb.
Add Funai's USB vendor ID to adb.
2011-07-14 10:49:22 -07:00
Ken Sumrall
e877ad7ae3
Merge "Add -o loop= option to mount, and fix error detection in mount and umount"
2011-07-13 18:57:28 -07:00
Mathias Agopian
ae3736a3d1
Add lock/unlock perform codes
...
these will be used to implement lock/unlock on
surfacetexture.
Change-Id: I75f8d8dd136433bd5d61610caeb763d836f8b4e7
2011-07-13 18:40:38 -07: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
Mathias Agopian
42cc1edfe7
Add setScalingMode to ANativeWindow
...
Also cleanup the header a bit. Give fixed values to enum
because these can never change. And try to make all
comments C (as opposed to C++)
Change-Id: Ie0914ccd81a0231f32e8c21a8ff730985c5c3607
2011-07-13 15:49:58 -07:00
Ken Sumrall
940c81078e
Add -o loop= option to mount, and fix error detection in mount and umount
...
This fixes bug http://b.android.com/18419 , which complains about a bogus
error check in the mount command (it also was wrong in the umount command)
and also asks for the mount command to support more than one loopback
device, as mentioned in the FIXME comments in mount.c. This required some
corresponding changes to umount.c
Change-Id: Ib796c70926395e61557e487bad64984d3295d5f3
2011-07-13 14:37:41 -07:00
Jean-Baptiste Queru
51ca95dc08
am 3415d411
: Merge "resolved conflicts for merge of 8f1f5b06
to gingerbread-plus-aosp" into gingerbread-plus-aosp
...
* commit '3415d411073113b44d9fcfd2b7ca7cc0d483d27c':
pixelflinger: back-port AOSP master version.
x86: Add vold.fstab to mount the SD card
Assembly coded android_memset16 and android_memset32
debuggerd: IA version
debuggerd: Reorganize to facilitate IA commit
Set the modes for rc.* files in /system/etc
DBUS is not fully implemented. Disable it for now
debuggerd: Show function names in tombstone backtraces
2011-07-12 15:03:34 -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
Jean-Baptiste Queru
f75a2ed213
Merge from gingerbread-plus-aosp
...
Change-Id: I55b84eda30edf0eade8b43712ab011cd3f65f0d9
2011-07-12 14:41:38 -07:00
Mathias Agopian
2258e08724
Merge "ANativeWindow: add more connectable APIs"
2011-07-12 14:13:42 -07:00
Jamie Gennis
5423e9e4ce
ANativeWindow: add more connectable APIs
...
This change adds three new possible values for the 'api' argument to
native_window_connect: CPU, MEDIA and CAMERA.
Change-Id: I9305a5c0c87ab06a2c2bd7c585f54c7c7470408a
Bug: 5020877
2011-07-12 13:54:59 -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
Jeff Brown
29e1e7393d
Remove the simulator target from all makefiles.
...
Bug: 5010576
Change-Id: I2fcf31af681d92880e5d31a46d5f6777f7ca1977
2011-07-11 22:12:32 -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
Chia-chi Yeh
56286d6fdb
Merge "init: update permissions for VPN."
2011-07-10 16:16:06 -07:00
Ashish Sharma
1ac6ddeba6
Move qtaguid.c from common sources in Android.mk to fix windows build.
...
Change-Id: I0a2d1615108b6c10064b3635d05699748a1341a4
2011-07-10 15:25:28 -07:00
Ashish Sharma
6dce8322d6
Fix header file inclusion for type uid_t.
...
Change-Id: I401fc0b41b4b77114fce7240662c9dfe4509e841
2011-07-10 14:04:25 -07:00
Ashish Sharma
dbbfba39a5
Merge "Add communication support for xt_qtaguid(network traffic accounting) kernel module."
2011-07-08 20:21:34 -07:00
Chia-chi Yeh
9bb4d411e0
init: update permissions for VPN.
...
VPN no longer uses system properties to keep network parameters.
Besides, profiles are now stored and encrypted by keystore.
Change-Id: I7575f04f350b7d8d5ba7008eb874a72180d057e8
2011-07-08 20:03:03 -07:00
Chia-chi Yeh
50d9819ef4
Merge "init: clean up init.rc as now mkdir handles EEXIST."
2011-07-08 19:26:45 -07:00
Ashish Sharma
8626cce5f3
Add communication support for xt_qtaguid(network traffic accounting) kernel module.
...
Change-Id: Ie0fb5b593987c53ee6f906fe6e0caab5a581d5a1
2011-07-08 19:17:03 -07:00
Chia-chi Yeh
ea74414159
init: clean up init.rc as now mkdir handles EEXIST.
...
Change-Id: I3fa2a618ef27197315fc128738a284ac644e86c0
2011-07-08 16:52:18 -07:00
Chia-chi Yeh
8a330bc533
Merge "init: make "mkdir" work even when the directory already exists."
2011-07-08 16:33:13 -07:00
Chia-chi Yeh
27164dce5f
init: make "mkdir" work even when the directory already exists.
...
This allows us to change permissions and ownerships of directories
in init scripts without adding additional commands.
Change-Id: I1815d6015953035251b98f28c0f3efd3c7f25f80
2011-07-08 16:06:56 -07:00
Jamie Gennis
6b06f9f48d
Merge "ANativeWindow: add setters for dimensions and fmt"
2011-07-08 13:51:31 -07:00
Wink Saville
7da24861ea
am 436deea5
: am 979203ee
: Add reset_mask as parameter to ifc_reset_connections
...
* commit '436deea5bbd43ae402ca8ee5bbc7fed3daaf3fce':
Add reset_mask as parameter to ifc_reset_connections
2011-07-08 12:28:18 -07:00
android-merger
39e219e9d6
reset, and keep history
2011-07-08 12:27:06 -07:00
Wink Saville
436deea5bb
am 979203ee
: Add reset_mask as parameter to ifc_reset_connections
...
* commit '979203ee34084327bf4f20ad1f878450de94826e':
Add reset_mask as parameter to ifc_reset_connections
2011-07-08 10:27:09 -07:00