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
David 'Digit' Turner
8f1f5b061f
merge intel x86 patches into gingerbread branch
2011-07-08 18:19:06 +02:00
The Android Open Source Project
1384e50b4d
Reconcile with gingerbread-release
...
Change-Id: I1b4ebc93955e3e929c8984e4e6b505d628061b68
2011-07-07 15:22:40 -07:00
android-merger
697fb7622b
Revert "Validate sender credentials on netlink msg receive"
...
This reverts commit b620a0b1c7
.
2011-07-07 14:52:12 -07:00
Dmitry Shmidt
0ac3adb038
Merge "libnl: nl_socket_alloc() Bugfix"
2011-07-07 14:10:31 -07:00
Wink Saville
979203ee34
Add reset_mask as parameter to ifc_reset_connections
...
The reset_mask allows either IPv4 and or IPv6 connections
of an interface to be reset.
Bug: 4981919
Change-Id: Id2d9ab90e30091d3d0764c66d4b01b73c0edbfcc
2011-07-07 12:16:12 -07:00
Jamie Gennis
208ec5ec56
ANativeWindow: add setters for dimensions and fmt
...
This change adds two new 'perform' setters to set the dimensions and
pixel format of the buffers that will be dequeued from the
ANativeWindow. These new setters provide the same functionality as
_SET_BUFFERS_GEOMETRY, but allow the format and dimensions to be set
independently. The _SET_BUFFERS_GEOMETRY setter is still supported to
maintain backwards compatibility.
Change-Id: Ib49b7798ffebe61eff2c8e4202fc3048cfec7bdd
2011-07-07 11:51:48 -07:00
Eric Laurent
f48fd5d403
Temporary workaround for issue 4604090
...
There was a regression caused by a change in Honeycomb that removed
mediaserver process from system group to improve security: This prevents
the audio HAL (which runs in mediaserver process) from taking wake locks
while audio is playing thus causing the pcm stream to get unexpectedly
suspended.
This temporary workaround is just to allow ICS dogfood in better conditions until
a real fix taking into account the security issue is implemented.
Change-Id: Ic19a23da4b4383559188b6f5c3a82604c3d95d74
2011-07-07 11:45:59 -07:00
Frank Maker
c28b79a6c2
libnl: nl_socket_alloc() Bugfix
...
Clear memory and allow kernel to set local socket pid
Change-Id: I274156fa7bcf8d2fe78f719fb2eb32d963682931
2011-07-06 22:15:34 -07:00
Mike Lockwood
e89675584d
Merge "init.rc: Allow system process to configure RNDIS USB ethernet address"
2011-07-06 17:53:56 -07:00
Mathias Agopian
64416c816c
Merge "don't restart surfaceflinger when the window manager dies"
2011-07-06 11:10:41 -07:00
Mike Lockwood
9350a00ce6
init.rc: Allow system process to configure RNDIS USB ethernet address
...
Change-Id: Id339d8359e592dbc1279e423d9a5adc3a775949d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-06 12:45:49 -04:00
Mathias Agopian
b4daef4531
don't restart surfaceflinger when the window manager dies
...
Change-Id: Ia3c60e6c5471e2b72d53c936de44b730c68095e0
2011-07-01 17:11:51 -07:00
Frank Maker
5744d312c8
Merge "BUGFIX: libnl_2"
2011-07-01 15:30:16 -07:00
Glenn Kasten
1f311f2f16
Merge "Bug 4571308 Timestamps are not always monotonic"
2011-07-01 15:02:06 -07:00
Brian Carlstrom
856f63c0df
Merge "Revert "Add keychain user""
2011-07-01 13:43:33 -07:00
Eino-Ville Talvala
8648c37975
Merge "Add mobile filter framework library into the bootclasspath."
2011-07-01 13:04:34 -07:00
Mike Lockwood
d18678f882
init: Handle EINTR in handle_property_set_fd()
...
Change-Id: I5a6f1791eaf11e98b1d81697112d78c99822fba5
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-01 15:04:38 -04:00
Eino-Ville Talvala
1c9a996c50
Add mobile filter framework library into the bootclasspath.
...
Change-Id: Ia9ae45de5d58ba5e98821fd04add96c6062c1a18
2011-07-01 10:30:01 -07:00
Brian Carlstrom
0491893023
Revert "Add keychain user"
...
This reverts commit 6541ef1562
.
Bug:4970237
Change-Id: I23a90eb89c1d19893d2ba7065fc624c0521cb06e
2011-07-01 09:50:31 -07:00
Frank Maker
1b53483949
BUGFIX: libnl_2
...
Fixed return value for nla_put.
Change-Id: If1ae33bb38c0e88ca7a9220e90ae35dfb0b44b86
2011-06-30 17:39:54 -07:00
Jeff Brown
fb9134e3d0
Merge "getevent: Fix a couple of bugs."
2011-06-30 14:35:46 -07:00
Jeff Sharkey
2e81f58baa
Merge "Create groups to protect bandwidth statistics."
2011-06-30 00:19:02 -07:00
Jeff Brown
f6d0f8af17
getevent: Fix a couple of bugs.
...
Fixed a bug printing the event value when using labels.
Stop trying to print the available codes for EV_SYN because
we cannot actually query them. EVIOCGBIT(0, size) is a special
case that returns the set of events that are supported, and
EV_SYN == 0.
Change-Id: Iea086ba24300ca0815e4814a3bc5ff60756612c2
2011-06-29 20:52:08 -07:00
Jeff Brown
f96993eb4e
lsof: Print process user name.
...
Change-Id: I6e96faba894ad8c2eeb06e514d332c8ab2ec52f0
2011-06-29 15:00:39 -07:00
Frank Maker
ed6b39cc77
Cleanroom libnl_2 library
...
By overriding the netlink cache pointer, able to pass nl80211 family id.
Scan and connecting open access point work
Added legal stuff to headers
Change-Id: I1c60452f35fdd1f80edebc03fef33067722d0543
2011-06-28 13:28:02 -07:00