Mathias Agopian
1233dca6a9
am c05d35db: Merge "fix [4026375] SensorManager quaternion functions can call sqrt with a negative number [DO NOT MERGE]" into gingerbread
...
* commit 'c05d35db1c57de97888f16ed74718e4c676e4a9b':
fix [4026375] SensorManager quaternion functions can call sqrt with a negative number [DO NOT MERGE]
2011-03-09 16:57:28 -08:00
Mathias Agopian
9e62542dcb
Merge "fix [4026375] SensorManager quaternion functions can call sqrt with a negative number [DO NOT MERGE]" into gingerbread
2011-03-09 16:54:14 -08:00
Lorenzo Colitti
726fda5a9f
am bd0e806a: Support IPv6->IPv4 fallback in HTTP streaming.
...
* commit 'bd0e806a61df9b67890dc3b1390db554e7468b4a':
Support IPv6->IPv4 fallback in HTTP streaming.
2011-03-09 15:09:20 -08:00
Lorenzo Colitti
7d838a4cad
am b9da16a1: Support IPv6 in HTTP streaming.
...
* commit 'b9da16a1e36fcf4e38a50adcf10ea59c12dea254':
Support IPv6 in HTTP streaming.
2011-03-09 15:09:04 -08:00
Mathias Agopian
5f1e78d730
am df6410dc: Merge "Fix [3513017] in lockscreen but showing empty launcher (live wallpaper) only" into gingerbread
...
* commit 'df6410dce3dae0bdb7e13118b3878079a1dcce03':
Fix [3513017] in lockscreen but showing empty launcher (live wallpaper) only
2011-03-07 18:04:06 -08:00
Mathias Agopian
f4e1ef0794
Merge "Fix [3513017] in lockscreen but showing empty launcher (live wallpaper) only" into gingerbread
2011-03-07 18:00:20 -08:00
Mathias Agopian
ee65ac8a71
Fix [3513017] in lockscreen but showing empty launcher (live wallpaper) only
...
37c2a37 fix [3408713] Dialog window invisible sometimes
d35c666 fix [3385504] Surface flinger hang when adding dim surface
1723b04 fix [3389263] OMX.Nvidia.h264.decode fails to shutdown
1b0114f fix a surface leak in SurfaceFlinger
Bug: 3513017
Change-Id: Ia13ed8c9cdcb1f484e177cdcaff687e7c88a10c3
2011-03-07 16:56:16 -08:00
Simon Wilson
cc06cc07bd
am 6b6869d5: Merge "mms: mms wap push length check before pdu processing." into gingerbread
...
* commit '6b6869d5c1a203e79dc272f2f0e53c184f44f24a':
mms: mms wap push length check before pdu processing.
2011-03-07 15:42:59 -08:00
Simon Wilson
8cb531d3c9
Merge "mms: mms wap push length check before pdu processing." into gingerbread
2011-03-07 15:39:19 -08:00
James Dong
5d64c1394a
am d581c047: Add missing copyright headers for a couple of files. DO NOT MERGE Cherry-picked from other branch...
...
* commit 'd581c04722e2610ca5471b9c3d1881043b1205b1':
Add missing copyright headers for a couple of files. DO NOT MERGE Cherry-picked from other branch...
2011-03-07 15:10:26 -08:00
Soojung Shin
771054210d
am ff5a0990: Added to check for supporting mms content-disposition, utf8 decoding.
...
* commit 'ff5a09904fb05f2776f1bbf1dd3915f38031190c':
Added to check for supporting mms content-disposition, utf8 decoding.
2011-03-04 17:16:49 -08:00
Lorenzo Colitti
840137c0fe
am b028ce55: Merge "Add a protocol property to the APNs and use it." into gingerbread
...
* commit 'b028ce55cac88f1778cdad59c63c52a5b66afb69':
Add a protocol property to the APNs and use it.
2011-03-03 17:07:56 -08:00
Lorenzo Colitti
99ee72c3ba
am 6987036f: Merge "Make setupDataCall take a protocol parameter." into gingerbread
...
* commit '6987036fabbd2c0351986efcfd11e714ae75fdf8':
Make setupDataCall take a protocol parameter.
2011-03-03 17:07:50 -08:00
Lorenzo Colitti
be1b18fcae
Merge "Add a protocol property to the APNs and use it." into gingerbread
2011-03-03 17:04:07 -08:00
Lorenzo Colitti
3187c38719
Merge "Make setupDataCall take a protocol parameter." into gingerbread
2011-03-03 17:03:58 -08:00
Jeff Brown
e572319eaf
am e23c235c: Merge "Only set KeyEvent long press flag when repeat count equals 1." into gingerbread
...
* commit 'e23c235c662c3028cfb080c6ed60d7defcdd0b69':
Only set KeyEvent long press flag when repeat count equals 1.
2011-03-03 15:03:26 -08:00
Jeff Brown
7a1626f037
Merge "Only set KeyEvent long press flag when repeat count equals 1." into gingerbread
2011-03-03 14:42:14 -08:00
Mike Lockwood
fb8cb42878
am 611af238: DO NOT MERGE: UsbManager: Don\'t display activity picker if there are no apps available for an accessory
...
* commit '611af238185cf924a425a1a2154b8439b8f8d7a5':
DO NOT MERGE: UsbManager: Don't display activity picker if there are no apps available for an accessory
2011-03-02 22:07:59 -08:00
Jeff Brown
ec7fb80775
Only set KeyEvent long press flag when repeat count equals 1.
...
This fixes a Gingerbread regression.
Bug: 3507021
Change-Id: Ia6030665b6a406332adc0ee0d8ee3cb735338c8e
2011-03-02 20:49:06 -08:00
Mike Lockwood
46eda25d96
am c9ac3f51: Merge "DO NOT MERGE: UsbService: Make sure the USB accessory function is disabled when we disconnect" into gingerbread
...
* commit 'c9ac3f5183be3f124f34ed49ac5766e0ba1aff77':
DO NOT MERGE: UsbService: Make sure the USB accessory function is disabled when we disconnect
2011-03-02 18:32:08 -08:00
Mike Lockwood
129c27d64d
Merge "DO NOT MERGE: UsbService: Make sure the USB accessory function is disabled when we disconnect" into gingerbread
2011-03-02 18:27:33 -08:00
Simon Wilson
5cd7131110
am edc68a00: Merge "Attempt to reduce problems from issue #3183612 " into gingerbread
...
* commit 'edc68a001cd94d2011029004cb27231432a18575':
Attempt to reduce problems from issue #3183612
2011-03-02 18:10:33 -08:00
Simon Wilson
4abb1f078d
Merge "Attempt to reduce problems from issue #3183612 " into gingerbread
2011-03-02 18:03:52 -08:00
Mike Lockwood
f57923aacc
am 1110748b: DO NOT MERGE: USB accessory support library
...
* commit '1110748b2df664f9c5066819c1f0616eae3394a7':
DO NOT MERGE: USB accessory support library
2011-03-02 15:38:55 -08:00
Mike Lockwood
a36e6bf8d1
am 40bbf929: DO NOT MERGE: Backport USB accessory support to gingerbread
...
* commit '40bbf9295d5245d3917629ce15f7b37670aef1ac':
DO NOT MERGE: Backport USB accessory support to gingerbread
2011-03-02 15:16:32 -08:00
Costin Manolache
a880e1e731
am db52ab69: Merge "DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions." into gingerbread
...
* commit 'db52ab69f22e24615eaa2e8f9845e157426d3dd6':
DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions.
2011-03-01 12:29:40 -08:00
Costin Manolache
a9869cf37b
Merge "DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions." into gingerbread
2011-03-01 12:25:21 -08:00
Dianne Hackborn
795af4d938
am 1de4a2ca: am 62619392: Merge "Fix leak when keylock is recreated."
...
* commit '1de4a2ca58df9bd21e054742f52e0af7a2ed5864':
Fix leak when keylock is recreated.
2011-02-28 18:06:46 -08:00
Dianne Hackborn
5b18439050
am 62619392: Merge "Fix leak when keylock is recreated."
...
* commit '626193926df0b3c7236e5c244f30d797d9192e0d':
Fix leak when keylock is recreated.
2011-02-28 18:03:12 -08:00
Dianne Hackborn
b00d5d94d6
Merge "Fix leak when keylock is recreated."
2011-02-28 17:54:54 -08:00
Jaikumar Ganesh
98a22899cc
am 9711b9b7: am 1eefb529: Merge "Phone crash when old callback func is woken up when enabling BT."
...
* commit '9711b9b7aa7448b44b85fe8158ded0364cc3540e':
Phone crash when old callback func is woken up when enabling BT.
2011-02-28 16:27:16 -08:00
Jaikumar Ganesh
03100c7446
am 1eefb529: Merge "Phone crash when old callback func is woken up when enabling BT."
...
* commit '1eefb529c78be5336f6c8a1b8ac2c32e268d4294':
Phone crash when old callback func is woken up when enabling BT.
2011-02-28 16:00:01 -08:00
Jaikumar Ganesh
51e164ad73
Merge "Phone crash when old callback func is woken up when enabling BT."
2011-02-28 15:33:34 -08:00
Mike Lockwood
b999303b88
am 61c1bb4f: Merge "UsbService: Remove stack-trace message during boot. DO NOT MERGE" into gingerbread
...
* commit '61c1bb4fef439650a3b88131c6e1360ffc03a7ed':
UsbService: Remove stack-trace message during boot. DO NOT MERGE
2011-02-28 13:18:06 -08:00
Mike Lockwood
b115c2440e
am 6da062a9: Merge "DO NOT MERGE: Clean up USB notifications:" into gingerbread
...
* commit '6da062a96c6f8126aad450a937144fab4333488f':
DO NOT MERGE: Clean up USB notifications:
2011-02-28 13:18:02 -08:00
Mike Lockwood
faaee3b419
am 3333f8af: Merge "DO NOT MERGE UsbManager: squashed commit of:" into gingerbread
...
* commit '3333f8afb2d1eae8bfdb41fa87f86836ad8702f7':
DO NOT MERGE UsbManager: squashed commit of:
2011-02-28 13:17:58 -08:00
Mike Lockwood
4b0caf3b83
am f7b99b32: Merge "Give system server permission to access USB. DO NOT MERGE" into gingerbread
...
* commit 'f7b99b32ad7a4872376355acabb5984142ba5e75':
Give system server permission to access USB. DO NOT MERGE
2011-02-28 13:17:54 -08:00
Mike Lockwood
1630f54d5b
Merge "UsbService: Remove stack-trace message during boot. DO NOT MERGE" into gingerbread
2011-02-28 13:12:11 -08:00
Mike Lockwood
93314ad737
Merge "DO NOT MERGE: Clean up USB notifications:" into gingerbread
2011-02-28 13:12:03 -08:00
Mike Lockwood
58a10b93fd
Merge "DO NOT MERGE UsbManager: squashed commit of:" into gingerbread
2011-02-28 13:11:55 -08:00
Mike Lockwood
f001d16081
Merge "Give system server permission to access USB. DO NOT MERGE" into gingerbread
2011-02-28 13:11:37 -08:00
Xavier Ducrohet
c6a02ff532
am edbd6139: Merge "Merge 1911a6f7 into gingerbread. do not merge." into gingerbread
...
* commit 'edbd6139b9d699879db2f14fb03b7b6a38bab9ea':
Merge 1911a6f7 into gingerbread. do not merge.
2011-02-28 12:29:08 -08:00
Xavier Ducrohet
13fbf42721
Merge "Merge 1911a6f7 into gingerbread. do not merge." into gingerbread
2011-02-28 12:24:01 -08:00
Jean-Baptiste Queru
5651616a91
am 25be2c72: am e0537f18: Merge "Fix of tearDown() in SingleLaunchActivityTestCase."
...
* commit '25be2c725eba1c94c7fc700e37b194fdcd83a1fb':
Fix of tearDown() in SingleLaunchActivityTestCase.
2011-02-28 10:18:30 -08:00
Jean-Baptiste Queru
3da332d6fa
am e0537f18: Merge "Fix of tearDown() in SingleLaunchActivityTestCase."
...
* commit 'e0537f1859664ba9c9cf87eb9d6dc3c16986dbb8':
Fix of tearDown() in SingleLaunchActivityTestCase.
2011-02-28 10:15:46 -08:00
Jean-Baptiste Queru
f9d33557e7
Merge "Fix of tearDown() in SingleLaunchActivityTestCase."
2011-02-28 10:12:08 -08:00
Xavier Ducrohet
6092202e99
am 6504490c: am dff6b8e7: Merge "Add --non-constant-id to aapt."
...
* commit '6504490cde3ec5d48321d539e654d1f2072b33f9':
GpsLocationProvider: Clean up HAL initialization/cleanup sequence
Fixed GSM encoded network initiated position request
Ensuring thread-safe usage of DateFormat.
Fixing infinite loop for zero duration.
Fix for an infinite loop while scrolling lists.
WAPPushManager, WAP Push over SMS message handler
Add --non-constant-id to aapt.
2011-02-28 09:51:38 -08:00
Xavier Ducrohet
4256fef269
am dff6b8e7: Merge "Add --non-constant-id to aapt."
...
* commit 'dff6b8e71dda9f5d841fa26408714aec2aef1505':
GpsLocationProvider: Clean up HAL initialization/cleanup sequence
Fixed GSM encoded network initiated position request
Ensuring thread-safe usage of DateFormat.
Fixing infinite loop for zero duration.
Fix for an infinite loop while scrolling lists.
WAPPushManager, WAP Push over SMS message handler
Add --non-constant-id to aapt.
2011-02-28 09:16:38 -08:00
Jamie Gennis
db7b742f65
am 919853ce: Merge "Prevent SurfaceFlinger from using layer token 31." into gingerbread
...
* commit '919853ce244f853966817d4adb2f3b7b6e4bbe74':
Prevent SurfaceFlinger from using layer token 31.
2011-02-27 15:44:36 -08:00
Jamie Gennis
eafc33acff
Merge "Prevent SurfaceFlinger from using layer token 31." into gingerbread
2011-02-27 15:27:22 -08:00