Andreas Huber
ad40891c43
Merge "Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore." into gingerbread
2010-08-30 13:04:21 -07:00
Eric Laurent
6a8099f637
Merge "LVM release 1.07 delivery." into gingerbread
2010-08-30 11:39:34 -07:00
Eric Rowe
9838cb73ab
Merge "DO NOT MERGE Add A2DP and Headset connection stress tests." into gingerbread
2010-08-30 11:37:10 -07:00
Eric Fischer
4cb6dd8679
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2010-08-30 10:28:58 -07:00
Andreas Huber
617fa2df06
Merge "ALoopers can now be named (useful to distinguish threads)." into gingerbread
2010-08-30 10:28:24 -07:00
Derek Sollenberger
bdedbf0713
Merge "Support pre-loading browser plugins on the system image." into gingerbread
2010-08-30 07:31:46 -07:00
Kenny Root
8e7ee82097
Merge "Allow native shared libraries in ASEC containers" into gingerbread
2010-08-27 16:42:28 -07:00
Brad Fitzpatrick
729f4ca190
Merge "Send broadcast intent when configured location providers change." into gingerbread
2010-08-27 16:02:21 -07:00
James Dong
9ee52948b8
Merge "Workaround for a QCOM issue where the output buffer size advertised by the AVC encoder is occasionally too small." into gingerbread
2010-08-27 14:33:54 -07:00
Wu-cheng Li
c60754900b
Merge "Unhide camera fps range API and deprecate old ones." into gingerbread
2010-08-27 14:20:51 -07:00
Mathias Agopian
af4764d570
Merge "cleanup EGL a bit. remove unused extension." into gingerbread
2010-08-27 14:14:46 -07:00
James Dong
a75ced9ce6
Merge "Suppress the video recording start signal - bug 2950297" into gingerbread
2010-08-27 13:47:06 -07:00
Andreas Huber
1afe05eb1b
Merge "Better support for rtsp (normal play-)time display. Better seek support, timeout if no packets arrive for too long." into gingerbread
2010-08-27 13:44:14 -07:00
Andreas Huber
2c39c50ac0
Merge "We accidentally always aborted after 10 secs, even if the connection was fine." into gingerbread
2010-08-27 13:44:07 -07:00
Mathias Agopian
10cab190ba
cleanup EGL a bit. remove unused extension.
...
Change-Id: Ia87120b076ab1bf7b28f06087878d8161fb46c88
2010-08-27 13:17:32 -07:00
Gilles Debunne
d22af9fe79
Merge "Added char limit to string" into gingerbread
2010-08-27 13:13:56 -07:00
Kenny Root
e96ad7bc45
Merge "Add debugging to ZipFileRO" into gingerbread
2010-08-27 12:58:00 -07:00
Kenny Root
e0573a4ad6
Add debugging to ZipFileRO
...
Some assets are failing to read from ZIP files. This adds a bit more
debugging to figure out what's going on.
Change-Id: Id90e10546c54c85069a34478fbc28bc2523bda5d
2010-08-27 12:47:34 -07:00
Gilles Debunne
3c07bb6459
Merge "Broken build. Missing ;" into gingerbread
2010-08-27 11:52:27 -07:00
Gilles Debunne
b481c7930b
Merge "DO NOT MERGE Removed "Stop selecting text" option." into gingerbread
2010-08-27 11:50:26 -07:00
Brad Fitzpatrick
73414a12ad
Merge "Document blocking behavior of ImageView setImageURI and setImageResource" into gingerbread
2010-08-27 11:49:31 -07:00
Mathias Agopian
e5b4978094
Merge "fix a race in SF buffer management" into gingerbread
2010-08-27 11:47:33 -07:00
Brad Fitzpatrick
12831aaacf
am f5287094: Fix closing tag in docs.
...
Merge commit 'f52870948d5d57d033fcdafc9c3fb0a872975447' into gingerbread
* commit 'f52870948d5d57d033fcdafc9c3fb0a872975447':
Fix closing tag in docs.
2010-08-27 11:35:53 -07:00
Brad Fitzpatrick
879e1ceecb
Merge "SharedPreferences$Editor.startCommit()" into gingerbread
2010-08-27 11:21:13 -07:00
Gilles Debunne
4ab6241a8e
Merge "DO NOT MERGE Text selection: tapping on selection opens context menu" into gingerbread
2010-08-27 10:33:17 -07:00
Gilles Debunne
9c060fe8e0
Merge "Fix for 512 limit in assetManager.list" into gingerbread
2010-08-27 10:32:43 -07:00
Cary Clark
eb61092706
Merge "DO NOT MERGE copy selected text on tap" into gingerbread
2010-08-27 08:12:34 -07:00
Brad Fitzpatrick
8a19c2db81
Merge "Fix some bugs in SettingsProvider that I introduced the other day." into gingerbread
2010-08-26 17:54:36 -07:00
Mathias Agopian
0e7f4292c7
fix a race in SF buffer management
...
also remove some unused code.
Change-Id: Iae2c3309b7a08055f3e13a5b866c5c084993e352
2010-08-26 17:42:27 -07:00
Eric Rowe
97e391e530
am 163fba0a: Merge "Improve logging and flexibility of BT stress tests." into froyo
...
Merge commit '163fba0a75dd582aa62187a062faa66d60db0d34' into gingerbread
* commit '163fba0a75dd582aa62187a062faa66d60db0d34':
Improve logging and flexibility of BT stress tests.
2010-08-26 17:30:28 -07:00
Eric Rowe
6a8cde145d
Merge "Improve logging and flexibility of BT stress tests." into froyo
2010-08-26 17:21:46 -07:00
Joe Onorato
d32b734835
Merge "Need to close the windowshade on ACTION_CLOSE_SYSTEM_DIALOGS and ACTION_SCREEN_OFF." into gingerbread
2010-08-26 13:54:13 -07:00
Andreas Huber
c46b7c50c1
Merge "Support for RTP packets arriving interleaved with RTSP responses." into gingerbread
2010-08-26 13:47:16 -07:00
Cary Clark
404860ee66
Merge "DO NOT MERGE -- copy on tapping outside of selected text in gmail" into gingerbread
2010-08-26 12:04:51 -07:00
Joe Onorato
059e073d52
am 797e688b: Continue trying to make the turn off quickly after call feature work.
...
Merge commit '797e688b3bebbf1f50a8ad08528740b064f79153' into gingerbread
* commit '797e688b3bebbf1f50a8ad08528740b064f79153':
Continue trying to make the turn off quickly after call feature work.
2010-08-26 12:02:51 -07:00
Joe Onorato
0b2976f5c6
Merge "Just disable widgets that come from apps on sd cards, because they don't work anyway." into gingerbread
2010-08-26 11:50:31 -07:00
Joe Onorato
0b97a51b75
Merge "Fix typo that makes apps on sd work better with app widgets." into gingerbread
2010-08-26 11:50:28 -07:00
Eric Laurent
0e2410cb38
Merge "Changed type of reverb presets from int to short" into gingerbread
2010-08-26 11:01:06 -07:00
Gilles Debunne
26c7992743
Merge "Fix for NPE in TextView." into gingerbread
2010-08-26 10:58:58 -07:00
Guang Zhu
0d6c2a6f01
Merge "add mouse up/down/click support in DumpRenderTree" into gingerbread
2010-08-26 10:49:19 -07:00
Dianne Hackborn
3d66e77ef3
Merge "Fix issue #2951784 : Launcher crashes on startup" into gingerbread
2010-08-26 10:47:48 -07:00
Eric Laurent
66f0eb4c10
Merge "Added automated tests for reverb audio effect." into gingerbread
2010-08-26 10:16:26 -07:00
James Dong
e4295dc132
Merge "Make sure that timestamp does not go backward in MP4 file writer" into gingerbread
2010-08-26 09:47:12 -07:00
Dianne Hackborn
a79061a3e4
Merge "Don't retain global ref to last inflated context." into gingerbread
2010-08-25 22:00:28 -07:00
Chia-chi Yeh
3898d53baa
Merge "Revert "RTP: integrate the echo canceller from speex."" into gingerbread
2010-08-25 19:43:58 -07:00
Hung-ying Tyan
c369e4f46c
Merge "CallManager: remove unused Phone argument from stopDtmf() and sendBurstDtmf()" into gingerbread
2010-08-25 19:27:50 -07:00
Chung-yih Wang
bf1f8696d7
Merge "Add dynamic uid info for tracking the sip service usage." into gingerbread
2010-08-25 19:25:02 -07:00
Konstantin Lopyrev
7c4f53c69a
Merge "Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared." into gingerbread
2010-08-25 17:35:50 -07:00
Romain Guy
37f2bb9e3f
Merge "reserve android.opengl.GLWallpaperService name for future use" into gingerbread
2010-08-25 17:26:20 -07:00
Kenny Root
4597abe41b
Merge "Add LFH offset to verbose list of APK" into gingerbread
2010-08-25 17:20:29 -07:00
