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
Jae Seo
6d956cc089
Use dhcp netmask value rather than its pointer (patch from Marvell)
...
Change-Id: Iffe2ca52333df4ef393c5305a5b66582006e4699
2011-07-29 15:23:39 +09:00
Benoit Goby
22bfc4cca0
Allow radio to set net.cdma* properties
...
Change-Id: I656abde9d06175eb158e84de4d08ede42620b46a
2011-07-28 18:10:23 -07:00
Wu-cheng Li
9d5bfd3541
Add camera frame metadata and face detection structs.
...
bug:4460717
Change-Id: Ib72abfba080529472cf3fecb712043403bf7295f
2011-07-29 07:07:48 +08:00
Eric Laurent
17e163182d
Merge "Fix issue 4604090: notification sound interrupted."
2011-07-27 09:03:46 -07:00
Jean-Michel Trivi
c349636c7c
Merge "Fix bug 4319552 Use commonly defined channel mask values in native"
2011-07-26 09:27:30 -07:00
Benoit Goby
9e9c18d55b
Merge "Allow radio to set net.lte* properties"
2011-07-25 20:26:58 -07:00
Wu-cheng Li
4518e6a299
Merge "Add camera face detection enums."
2011-07-25 19:02:26 -07:00
Eric Laurent
3507616870
Fix issue 4604090: notification sound interrupted.
...
Removed system from mediaserver groups. Not needed anymore
now that AudioFlinger acquires wake locks via PowerManagerService.
Change-Id: I177b968a0a30557d871188bf3991b96d9b391d3c
2011-07-25 18:41:30 -07:00
Benoit Goby
7100f640de
Allow radio to set net.lte* properties
...
Change-Id: I4b7a280ba4c773673b28db8cfbbffcb360ee717f
2011-07-25 18:02:06 -07:00
Wu-cheng Li
de19ea2602
Add camera face detection enums.
...
bug:4460717
Change-Id: Id5cadcd7cdab9a9978569caf27d2ef2747fa6570
2011-07-26 08:45:50 +08:00
Conley Owens
c21dcef9fe
am 45e8fc6b: am 8621b5ea: am 212282c3: am 80dbd2a7: Merge "Fix build error in init when building with bootchart"
...
* commit '45e8fc6bfd9221274f48861287ff7af06ee7a199':
Fix build error in init when building with bootchart
2011-07-25 17:25:13 -07:00
Jean-Michel Trivi
6d4f39754b
Fix bug 4319552 Use commonly defined channel mask values in native
...
The native channel mask values are equal to the Java values, which
differ from other standards simply for legacy reasons. It is
preferrable to use commonly used values, and translate from the
Java constants to the common values when specifying a Java mask.
The new definitions uses the same values and ordering as in
OpenSL ES and other standards.
Change-Id: I879f64b281714c60684cd8b36fe6ae648a555121
2011-07-25 17:02:11 -07:00
Jeff Brown
2d3205d2a1
Merge "Dump the HID descriptor when available."
2011-07-25 15:51:40 -07:00
Conley Owens
45e8fc6bfd
am 8621b5ea: am 212282c3: am 80dbd2a7: Merge "Fix build error in init when building with bootchart"
...
* commit '8621b5ea475822499128e6f138a9dfc224bbb569':
Fix build error in init when building with bootchart
2011-07-25 12:21:21 -07:00
Jean-Michel Trivi
2ca5592218
Merge "Fix bug 4211099 channel constants and 7.1 mask"
2011-07-25 11:24:14 -07:00
JP Abgrall
2519778775
Merge "NetlinkEvents: adding support for iptables' quota2 NFLOG messages."
2011-07-25 10:14:24 -07:00
Jean-Michel Trivi
33fad99acf
Fix bug 4211099 channel constants and 7.1 mask
...
Add definitions for the side and elevated channels.
Ccorrect definition of 7.1 mask which uses
the side channels rather than the front half-pan channels.
Change-Id: I5b6f601f6404d782dc46ef47efac9cc8441fef90
2011-07-24 16:31:03 -07:00
Jeff Brown
4ac87154c1
Dump the HID descriptor when available.
...
Also, always print the input properties when -p is
specified.
Change-Id: Ibacb6dd26ccab68c85b76928df60fdc2a53c198c
2011-07-24 14:30:44 -07:00
Mike Lockwood
a0cba73055
Merge "Fix returning errno values which should be negative."
2011-07-22 12:19:26 -07:00
Yuncheol Heo
2fc9fc7c8e
Fix returning errno values which should be negative.
...
Change-Id: Id6464b127678ca1d9f4afa7c99fcfce361f4ad4a
2011-07-22 22:05:27 +09: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
Mathias Agopian
5100916182
support for "Add an ANativeWindow API for SurfaceFlinger to suggest an optimal buffer orientation"
...
Bug: 4487161
Change-Id: I36708fd155415adbb666137692252381c19abcf6
2011-07-19 17:09:35 -07:00
Mike Lockwood
b32904a9ea
am 01acea11: am 1f72fe99: am 7df080b2: am 3ddaa0ad: Merge "adb: Add USB vendor ID for Lenovo"
...
* commit '01acea112501f7d140f100591319781e59b90d0e':
adb: Add USB vendor ID for Lenovo
2011-07-18 09:23:23 -07:00
Mike Lockwood
01acea1125
am 1f72fe99: am 7df080b2: am 3ddaa0ad: Merge "adb: Add USB vendor ID for Lenovo"
...
* commit '1f72fe991dc2e48c13518015c523f9e3ea048af2':
adb: Add USB vendor ID for Lenovo
2011-07-18 09:18:58 -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
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
JP Abgrall
e6f80149a2
NetlinkEvents: adding support for iptables' quota2 NFLOG messages.
...
It passes the quota2 name and the device at the time the quota was
reached.
ALERT_NAME=...
INTERFACE=...
This needs the new kernel in which xt_quota2 can log.
Change-Id: Icf5045374e1e33bdd1da0d2a2c183e70903a1fea
2011-07-14 16:46:32 -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
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
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