Commit Graph

17615 Commits

Author SHA1 Message Date
Eric Fischer
d2cd24d8ce Merge "Import revised translations. DO NOT MERGE" into gingerbread 2011-03-18 15:22:05 -07:00
Valentin Kravtsov
16f5cc4c58 Merge "Fixing a race condition in RecognitionService" into gingerbread 2011-03-18 08:49:51 -07:00
Xia Wang
0d2b3fe91d Merge "Port wi-fi stress test into GB DO NOT MERGE" into gingerbread 2011-03-17 15:06:40 -07:00
Simon Wilson
2d0c7bfc6a Merge "DO NOT MERGE Add images to ERI icon list" into gingerbread 2011-03-16 19:51:07 -07:00
Dianne Hackborn
9db5a3473f Merge "Improve error reporting for issue #3183612" into gingerbread 2011-03-15 14:40:56 -07:00
Mike Lockwood
79ae55e051 Merge "DO NOT MERGE: Backport more USB accessory changes from honeycomb" into gingerbread 2011-03-15 14:04:54 -07:00
Xavier Ducrohet
124eb84c5e Merge "Merge 6f2fb570 from honeycomb. do not merge." into gingerbread 2011-03-15 11:29:16 -07:00
Xavier Ducrohet
1d0284b613 Merge "Merge c12b4093 from honeycomb. do not merge." into gingerbread 2011-03-15 11:29:07 -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
Mike Lockwood
d24c514601 Merge "DO NOT MERGE: backport recent USB accessory changes from honeycomb" into gingerbread 2011-03-14 13:17:24 -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
James Dong
f3f7d3504e Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into gingerbread 2011-03-11 13:38:02 -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
Robert Greenwalt
de528f2bd8 Merge "Don't accept a user-defined dun-capable connection" into gingerbread 2011-03-10 10:41:36 -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
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
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
8cb531d3c9 Merge "mms: mms wap push length check before pdu processing." into gingerbread 2011-03-07 15:39:19 -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
7a1626f037 Merge "Only set KeyEvent long press flag when repeat count equals 1." into gingerbread 2011-03-03 14:42:14 -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
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
4abb1f078d Merge "Attempt to reduce problems from issue #3183612" into gingerbread 2011-03-02 18:03:52 -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
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
13fbf42721 Merge "Merge 1911a6f7 into gingerbread. do not merge." into gingerbread 2011-02-28 12:24:01 -08:00
Jamie Gennis
eafc33acff Merge "Prevent SurfaceFlinger from using layer token 31." into gingerbread 2011-02-27 15:27:22 -08:00
Svetoslav Ganov
c174c6696c Merge "Use different version of CLDR data in DatePicker" into gingerbread 2011-02-24 23:56:52 -08:00
Xavier Ducrohet
be82ce21d5 Merge "LayoutLib: Adapt the HC layoutlib to GB. do not merge." into gingerbread 2011-02-24 14:44:58 -08:00
Xavier Ducrohet
e90a80a73d Merge "LayoutLib: Original import of Honeycomb's layoutlib. do not merge." into gingerbread 2011-02-24 14:44:52 -08:00
Alon Albert
1f3dcff801 Merge "DO NOT MERGE - Increasing timeout to 60 sec This was already done in HC branch in this CL: https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=commit;h=d39fd5a97c6f56794a6ed7ac1dfb0bbf585becf1 This is also related to bug http://b/issue?id=3402863 I first considered increasing the timeout specificaly for our GData client but when I saw we already accepted a CL for HC that did this at a lower level, I decided to do that instead." into gingerbread 2011-02-24 09:20:46 -08:00
Jason Chen
9281fda8e0 Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread 2011-02-23 17:23:53 -08:00
Jamie Gennis
8a5d77b8e5 Merge "egl: fixes for object refcounts" into gingerbread 2011-02-23 12:30:55 -08:00
Michael I. Gold
3e52713ffd egl: fixes for object refcounts
eglMakeCurrent() would only deref the previous surfaces if the old and
new contexts were the same.  eglTerminate() should not touch TLS.
eglReleaseThread() needs to unbind the current context.

Change-Id: I7f4c090a287ee1e29e4708ae10679fb9d7d8c8c5
Related-Bug: 2964479
2011-02-22 18:15:08 -08:00
Alon Albert
61d36d7cc4 Merge "Support quoted parameters" into gingerbread 2011-02-22 10:31:26 -08:00
Maarten Hooft
1db90719b3 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2011-02-17 17:17:40 -08:00
Robert Greenwalt
b9ce99c940 Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread 2011-02-16 10:44:26 -08:00
Alon Albert
b088416f08 Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread 2011-02-16 10:20:13 -08:00
Andreas Huber
071969e5d3 Merge "DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary" into gingerbread 2011-02-16 08:50:37 -08:00
Robert Ly
08f2087b06 Merge "Adding package summary for nfc.tech package" into gingerbread 2011-02-15 17:44:56 -08:00