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
Robert Ly
8a53f66ac7
Merge "doc change: fix missing code ending tag" into honeycomb
2011-02-22 16:57:06 -08:00
James Dong
62021d2145
Merge "Remove mkvparser code from /frameworks/base"
2011-02-22 16:52:12 -08:00
Wink Saville
6432ed33d5
Merge "Add queryFacilityLockForApp and setFacilityLockForApp for v6 ril.h."
2011-02-22 16:51:47 -08:00
Scott Main
1287cd2dc5
Merge "docs: fix broken links" into honeycomb
2011-02-22 16:49:32 -08:00
Stephen Hines
3dc9c966c4
Merge "Fixing incremental build."
2011-02-22 16:45:36 -08:00
Andreas Huber
3bf883b74d
Merge "Support for PCMA and PCMU raw audio data in RTP/RTSP."
2011-02-22 16:42:31 -08:00
James Dong
14b4aa8855
Merge "Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed" into honeycomb
2011-02-22 16:41:29 -08:00
Jeff Brown
a8a8ef41ff
Merge "Be more precise about tracking fallback keys."
2011-02-22 16:37:50 -08:00
Kenny Root
27ec88704c
Merge "Fix poll options for NativeActivity's hasEvents"
2011-02-22 16:08:42 -08:00
Gilles Debunne
bca8490f60
Merge "Text selection handles correctly scroll"
2011-02-22 15:48:06 -08:00
Scott Main
bc20a560ca
Merge "docs: update highlights doc to remove preview" into honeycomb
2011-02-22 15:36:31 -08:00
Scott Main
acc6b035bd
Merge "docs: add breadcrumb trails to some docs, mostly manifest docs" into honeycomb
2011-02-22 15:14:39 -08:00
Fabrice Di Meglio
e8e10da2c5
Merge "Code cleaning"
2011-02-22 15:03:24 -08:00
Maarten Hooft
6030f4e0ed
am 62f40c8b: (-s ours) am 99cca89f: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit '62f40c8bcf78ac872a01aee8840b808b5aeea1d8':
Import revised translations. DO NOT MERGE
2011-02-22 14:48:40 -08:00
Romain Guy
586b7f4690
am ad492161: am a2090bea: am 7118bdec: Merge "Fix for #12945 : ProgressBar.setMax() will always redraw."
...
* commit 'ad492161e4384efe11daec60cd14902f6b2c662a':
Fix for #12945 : ProgressBar.setMax() will always redraw.
2011-02-22 14:48:21 -08:00
Alex Sakhartchouk
c454f2a852
Merge "Moving renderscript tests away from the library to a dedicated test folder."
2011-02-22 14:32:26 -08:00
Gilles Debunne
182e3f9598
Merge "Bugfixes in StaticLayout."
2011-02-22 14:00:28 -08:00
Mike Lockwood
df614da37a
Merge "MTP: Disable MTP when the keyguard is locked and secure"
2011-02-22 13:59:43 -08:00
Gilles Debunne
093378873c
Merge "Tuning the touch up filter."
2011-02-22 13:59:20 -08:00
Mike Lockwood
497b353afc
Merge "MTP: Add support for dynamically adding and removing storage units"
2011-02-22 13:59:16 -08:00
Gilles Debunne
e1b5231be4
Merge "Cursor background attribute made public"
2011-02-22 13:57:36 -08:00
Gilles Debunne
17d97a4301
Merge "Fixes around cursor blink."
2011-02-22 13:57:14 -08:00
Gilles Debunne
6bb6a42406
Merge "Cursor does not jump back to its previous position when IME is showed up."
2011-02-22 13:57:00 -08:00
Andreas Huber
3a9770bbd4
Merge "Support more MPEG4-LATM audio functionality."
2011-02-22 13:51:22 -08:00
Jesse Wilson
909b8db042
Merge "Save a few bytes on the zygote heap."
2011-02-22 13:20:56 -08:00
Mike Lockwood
7a699ef941
Merge "KeyguardManager: Add isKeyguardLocked() and isKeyguardSecure()"
2011-02-22 13:11:11 -08:00
James Dong
fcbada9241
Merge "Check file descriptor before passing it through binder calls"
2011-02-22 13:10:15 -08:00
Dianne Hackborn
1c00e01067
Merge "Add missing header comment."
2011-02-22 13:05:01 -08:00
Daniel Sandler
ebf2950f61
Merge "Fix the flipping orientation lock."
2011-02-22 13:04:49 -08:00
Dirk Dougherty
809780b260
Merge "Doc change: Add doc for GL texture declaration/filtering, hardwareAccelerated manifest attr." into honeycomb
2011-02-22 12:47:25 -08:00
Roman Nurik
e3d7294012
Merge "Document support for WebM/VP8 decoding." into honeycomb
2011-02-22 12:43:15 -08:00
Romain Guy
0285105584
Merge "Add more info to View.getLayoutParams()"
2011-02-22 11:50:32 -08:00
Romain Guy
0e3e552c2f
Merge "Add missing docs to AttributeSet."
2011-02-22 11:30:09 -08:00
Romain Guy
252d083159
Merge "Fix incorrect id name in ListActivity's documentation."
2011-02-22 11:22:23 -08:00
Romain Guy
10d6f8465b
Merge "Add documentation to GridView."
2011-02-22 11:13:29 -08:00
Patrick Scott
45ed724c03
Merge "Scroll layers on touch events."
2011-02-22 11:06:02 -08:00
Cary Clark
818ff70303
Merge "don't scale nav slop when zooming"
2011-02-22 11:04:44 -08:00
Jaikumar Ganesh
b8d7a33ef4
Merge "Fix compiler errors when compiled with debug option."
2011-02-22 10:57:48 -08:00
Basavapatna Dattaguru
5fd0aee8c2
Merge "VideoEditor:IssueID:3396697: Added Performance test code"
2011-02-22 10:56:29 -08:00
Basavapatna Dattaguru
96cf5f0e08
Merge "VideoEditor:IssueID:3396697: Updated Preview Test code"
2011-02-22 10:56:19 -08:00
Rajneesh Chowdury
c37dc738c4
Merge "Fix for 3458686 Play button is enabled before loading the transition. Play results in Native Crash"
2011-02-22 10:50:21 -08:00
Jaikumar Ganesh
92ba2d8b6e
Merge "Make BluetoothInputDevice inherit from BluetoothProfile."
2011-02-22 10:43:53 -08:00
Alon Albert
61d36d7cc4
Merge "Support quoted parameters" into gingerbread
2011-02-22 10:31:26 -08:00
Mike Lockwood
a4e068a599
Merge "UsbService: Re-enable previously enabled functions when exiting accessory mode"
2011-02-22 10:11:46 -08:00
Nick Pelly
f8f4b975f9
Merge "DO NOT MERGE." into honeycomb
2011-02-22 09:10:32 -08:00
Jesse Wilson
db4d996f08
Merge "Adopt LruCache in SettingsProvider."
2011-02-22 08:46:14 -08:00
Chung-yih Wang
791917bc0a
Merge "Add rport argument for a reinvite request."
2011-02-22 01:05:36 -08:00
Irfan Sheriff
c51a552543
Merge "Do not backup wifi country code settings"
2011-02-21 13:46:56 -08:00
Robert Greenwalt
7dc7de5ce1
Merge "Remove some unused code."
2011-02-21 13:25:14 -08:00
