Brad Fitzpatrick
dce27d58b5
Merge "Releasing lock even if exception is thrown."
2011-03-15 11:23:44 -07:00
Brad Fitzpatrick
6c8eb099e4
Merge "Lazy initialization must be synchronized to avoid parallel instances cretation."
2011-03-15 11:22:43 -07:00
Brad Fitzpatrick
3b2122f9a2
Merge "Removing self-assignment statement."
2011-03-15 11:19:23 -07:00
Brad Fitzpatrick
47c8e50c57
Merge "Fixing self-assignment in copying code."
2011-03-15 11:18:18 -07:00
Brad Fitzpatrick
03af2d42a4
Merge "Fixing self-assignment in cloning code."
2011-03-15 11:15:19 -07:00
Brad Fitzpatrick
201c38b39c
Merge "Removing repetitive conditional; it simply does nothing except slowing down things."
2011-03-15 11:13:01 -07:00
Brad Fitzpatrick
9860849b8d
Merge "Removing repetitive conditional; it simply does nothing except slowing down things."
2011-03-15 11:12:15 -07:00
Brad Fitzpatrick
5a98e39e1c
Merge "Fixing improper boxing to Integer instead of Long."
2011-03-15 11:03:29 -07:00
Brad Fitzpatrick
d42a9b74bc
Merge "Using proper key for removing object from the map."
2011-03-15 11:00:51 -07:00
Brad Fitzpatrick
c53163a4a3
Merge changes I81fc2f90,I5e7fd759
...
* changes:
Using proper key for removing from map.
Removing wrong equals method in comparator.
2011-03-15 10:56:16 -07:00
Dianne Hackborn
152f8c41d0
am 44220a56: Merge "Add some debug code to try to track down issue 3183612" into gingerbread
...
* commit '44220a56026ead4583a9db96ced5f1113d4b4f07':
Add some debug code to try to track down issue 3183612
2011-03-15 10:52:27 -07:00
Dianne Hackborn
bebc96ba62
Merge "Add some debug code to try to track down issue 3183612" into gingerbread
2011-03-15 10:29:04 -07:00
Ying Wang
a68f3ad15a
am bf079216: Dist classes.jar with full class files inside
...
* commit 'bf079216c607b660a0ad219df6c4752906a7fc61':
Dist classes.jar with full class files inside
2011-03-14 13:45:34 -07:00
Mike Lockwood
d35aa6953c
am 78b8e1be: Merge "DO NOT MERGE: backport recent USB accessory changes from honeycomb" into gingerbread
...
* commit '78b8e1be97c61f7e0b28b145fadd0c646fd1c46b':
DO NOT MERGE: backport recent USB accessory changes from honeycomb
2011-03-14 13:37:54 -07:00
Simon Wilson
ab42c6e9bd
am ee3f6ef2: Merge "DO NOT MERGE Support WiMAX Settings & ticker message" into gingerbread
...
* commit 'ee3f6ef2fc7bcfae9d8af8430760388f653a10c8':
DO NOT MERGE Support WiMAX Settings & ticker message
2011-03-14 13:34:18 -07:00
Daniel Sandler
1d54dc2d85
am 45660662: Merge "Workaround unknown ERI indices." into gingerbread
...
* commit '45660662e61e8cc3ff13144668767a86d1d5b7f4':
Workaround unknown ERI indices.
2011-03-14 13:34:08 -07:00
Mike Lockwood
d24c514601
Merge "DO NOT MERGE: backport recent USB accessory changes from honeycomb" into gingerbread
2011-03-14 13:17:24 -07:00
Gilles Debunne
4feb59c624
resolved conflicts for merge of 9c06c0ff to gingerbread-plus-aosp
...
Change-Id: I7f9c71eeb9fc5e01856f764930c6f168741cc9da
2011-03-14 12:57:01 -07:00
Simon Wilson
82333c550e
Merge "DO NOT MERGE Support WiMAX Settings & ticker message" into gingerbread
2011-03-14 11:40:17 -07:00
Daniel Sandler
d0dca10d5d
Merge "Workaround unknown ERI indices." into gingerbread
2011-03-14 11:37:12 -07:00
Gilles Debunne
d567127f0a
Merge "Double tap on a word no longer opens context menu. DO NOT MERGE" into gingerbread
2011-03-14 11:30:17 -07:00
Kenny Root
a05c7c2920
am 2fdf829a: Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp"
...
* commit '2fdf829a17fdac4e6d65f5a85a69d0ec9cfd0a7d':
Remove unnecessary SkImageDecoder_libjpeg.cpp
2011-03-11 15:45:34 -08:00
James Dong
0f1351ed69
am 68f66b94: Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into gingerbread
...
* commit '68f66b945e7a69549689becd2e656d9056f1e7f5':
MP3Extractor and MP3 decoder fixes - DO NOT MERGE
2011-03-11 14:31:37 -08:00
Kenny Root
eb9d908d96
Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp"
2011-03-11 14:22:22 -08:00
James Dong
f3f7d3504e
Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into gingerbread
2011-03-11 13:38:02 -08:00
Ying Wang
e64fc17f7a
am 69e725eb: Merge "Dist com.android.nfc_extras.jar." into gingerbread
...
* commit '69e725eb8806180749b66903382754c86a15d0f6':
Dist com.android.nfc_extras.jar.
2011-03-11 12:05:22 -08:00
Robert Greenwalt
1b9ff06914
am b5c51d5f: Merge "DO NOT MERGE Backport of I1f55df8a from master." into gingerbread
...
* commit 'b5c51d5fa88c56ebbfb56af89beb077aa4f1f2f8':
DO NOT MERGE Backport of I1f55df8a from master.
2011-03-11 11:52:31 -08:00
Ying Wang
71d6c882b4
Merge "Dist com.android.nfc_extras.jar." into gingerbread
2011-03-11 10:17:49 -08:00
Robert Greenwalt
f0e9794de9
Merge "DO NOT MERGE Backport of I1f55df8a from master." into gingerbread
2011-03-11 10:14:28 -08:00
Nick Pelly
37ee500094
am 367f41f8: Implement new NFC-EE API\'s as shared library (frameworks/base).
...
* commit '367f41f8f61126c2ab34a34cc676756a9fc23ac2':
Implement new NFC-EE API's as shared library (frameworks/base).
2011-03-10 16:32:28 -08:00
Robert Greenwalt
bc4d343181
am dfcb8c51: Merge "Don\'t accept a user-defined dun-capable connection" into gingerbread
...
* commit 'dfcb8c511635431d536fd3ef1894378f4424ef1a':
Don't accept a user-defined dun-capable connection
2011-03-10 11:59:17 -08:00
Robert Greenwalt
de528f2bd8
Merge "Don't accept a user-defined dun-capable connection" into gingerbread
2011-03-10 10:41:36 -08:00
TK MUN
b425516715
am 4bdab175: DO NOT MERGE WiMAX support
...
* commit '4bdab1751f0db3b2f03e8c58ef5c11a543dfa3c7':
DO NOT MERGE WiMAX support
2011-03-09 22:54:44 -08:00
Mathias Agopian
18570db84e
am 33029221: Merge "revert the surface purgatory list and dependent changes." into gingerbread
...
* commit '33029221619f14577bd0d0e7c2f815abc8f1b8ea':
revert the surface purgatory list and dependent changes.
2011-03-09 17:11:10 -08:00
Mathias Agopian
c1315657bd
Merge "revert the surface purgatory list and dependent changes." into gingerbread
2011-03-09 17:07:27 -08:00
Mathias Agopian
f7662afb76
revert the surface purgatory list and dependent changes.
...
6d0f6cb Revert "Fix [3513017] in lockscreen but showing empty launcher (live wallpaper) only"
6154412 Revert "partially fix [3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)"
37c2a37 fix [3408713] Dialog window invisible sometimes
It looks like there is a surface leak, it's unclear where it is.
Without those reverts, this would cause a leak of the associated buffers
which is far more problematic. this change might hide the surface leak.
Bug: 4078032
Change-Id: Iedcda3ffcdd2f69d41047b5c3134c1e867ff90d7
2011-03-09 17:00:41 -08:00
Mathias Agopian
9d0cbdad36
am b710a50a: Merge "fix [3452750] Issue 14634: SensorManager.getRotationMatrixFromVector gets NaN-Values [external] [DO NOT MERGE]" into gingerbread
...
* commit 'b710a50ab6ca36b502f548e8551f620e98bbb1d8':
fix [3452750] Issue 14634: SensorManager.getRotationMatrixFromVector gets NaN-Values [external] [DO NOT MERGE]
2011-03-09 16:57:32 -08:00
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
e379402df1
Merge "fix [3452750] Issue 14634: SensorManager.getRotationMatrixFromVector gets NaN-Values [external] [DO NOT MERGE]" into gingerbread
2011-03-09 16:54:21 -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
Johan Redestig
bbd0dc8607
Implement support for ALT and SHIFT modifiers
...
The spec for keymaps and keboard input at
http://source.android.com/porting/keymaps_keyboard_input.html
mentions the stand alone ALT and SHIFT modifiers:
SHIFT: While pressed, the shift key modifier is set
ALT: While pressed, the alt key modifier is set
This commit implements support for these.
Change-Id: I5854ef3df541740cc3443b474a9c41183eb7561c
Ex: key 305 BACK ALT
2011-03-08 16:27:46 +01: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