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
Dianne Hackborn
85e9b6dd59
Merge "Fix a fun bug with multiple service bindings from an activity." into gingerbread
2010-08-25 16:31:34 -07:00
Mathias Agopian
a1f8246d2c
Merge "Improve Sensors documentation a bit" into gingerbread
2010-08-25 16:03:58 -07:00
Andreas Huber
c22873a08c
Merge "Fix support for per-frame unsynchronization in ID3V2.4 tags." into gingerbread
2010-08-25 15:35:53 -07:00
Mathias Agopian
7cd54c14b2
Merge "fix [2946787] Screen flicker on low resolution setting in camcorder." into gingerbread
2010-08-25 15:25:32 -07:00
Brad Fitzpatrick
80344d13ed
Merge "Start of SharedPreferences$Editor.startCommit()" into gingerbread
2010-08-25 15:15:30 -07:00
Mathias Agopian
eff062c49e
fix [2946787] Screen flicker on low resolution setting in camcorder.
...
Change-Id: I7e86f2b6d85dcae8dd212890b978fa6ac7de6893
2010-08-25 15:09:52 -07:00
Eric Laurent
b27990fd4b
Merge "Added preset reverb." into gingerbread
2010-08-25 15:09:10 -07:00
Andreas Huber
fc48cc9e68
Merge "Ensure that buffering updates eventually hit 100% after we download everything." into gingerbread
2010-08-25 14:54:36 -07:00
Andreas Huber
62c6ce2e71
Merge "Allow sniffers to return a packet of opaque data that the corresponding extractor can take advantage of to not duplicate work already done sniffing. The mp3 extractor takes advantage of this now." into gingerbread
2010-08-25 13:10:04 -07:00
Mathias Agopian
150bd0b2d7
Merge "don't try to lock a buffer that wasn't allocated with SW usage bits" into gingerbread
2010-08-25 12:15:38 -07:00
Mathias Agopian
f1b38247d4
don't try to lock a buffer that wasn't allocated with SW usage bits
...
Change-Id: Iabbcec1bfa30dc47d45ece699dd178653f1b675b
2010-08-25 12:14:27 -07:00
Brian Carlstrom
9730e61a6d
Merge "Remove "StringTest.java"." into gingerbread
2010-08-25 11:02:22 -07:00
Brian Carlstrom
d61798d7ae
Merge "Update AndroidRuntime with dalvik-dev changes" into gingerbread
2010-08-25 10:53:10 -07:00
Eric Laurent
944d8e92c4
Merge "Fix the simulator build." into gingerbread
2010-08-25 10:37:27 -07:00
Jean-Baptiste Queru
1c07fd511d
am d5e601c2: reconcile open-source froyo into google variant
...
Merge commit 'd5e601c2304610085e3d7a276c4bbcd984ac89f9' into gingerbread
* commit 'd5e601c2304610085e3d7a276c4bbcd984ac89f9':
Make the default backup configuration "disabled; local transport selected"
2010-08-25 10:15:38 -07:00
Jean-Baptiste Queru
c1ee89ac9c
reconcile open-source froyo into google variant
...
Change-Id: Idfacbf98a6c98176620f252504213d01bbd49eb9
2010-08-25 09:40:59 -07:00
Brian Carlstrom
fd30cf4f96
Merge "Fix linux 64 build" into gingerbread
2010-08-25 09:28:00 -07:00
Chih-Chung Chang
20f8ea43a3
Merge "Avoid allocating buffer every time getThumbnail is called." into gingerbread
2010-08-25 00:07:23 -07:00
Hung-ying Tyan
7a84ed62a8
Merge "SipProfile: add isOutgoingCallAllowed() and new builder constructor" into gingerbread
2010-08-24 23:57:50 -07:00
Rohit Mungee
6d4d8c5115
Merge "Add support for generated documentation as part of the SDK docs." into gingerbread
2010-08-24 22:59:41 -07:00
Daisuke Miyakawa
391adbe13d
Merge "Fix the test breakage in vCard tests." into gingerbread
2010-08-24 18:29:24 -07:00
Christopher Tate
2a7b3ebb99
am 02e18d4d: Merge "Make the default backup configuration "disabled; local transport selected"" into froyo
...
Merge commit '02e18d4d4eed949da02fd8aa87801858d99b902a' into gingerbread
* commit '02e18d4d4eed949da02fd8aa87801858d99b902a':
Make the default backup configuration "disabled; local transport selected"
2010-08-24 18:21:39 -07:00
Brad Fitzpatrick
d11bc2f33a
Merge "Negatively cache settings and proactively slurp settings into cache." into gingerbread
2010-08-24 18:10:36 -07:00
Christopher Tate
b37cb69fe3
Merge "Make the default backup configuration "disabled; local transport selected"" into froyo
2010-08-24 18:05:09 -07:00
Mathias Agopian
a85cdcc130
Merge "fix [2931513] Add support for setting the orientation of an ANativeWindow" into gingerbread
2010-08-24 16:23:12 -07:00
Mathias Agopian
b661d66013
fix [2931513] Add support for setting the orientation of an ANativeWindow
...
Also implement support for cropping.
Change-Id: Iba5888dd242bf2feaac9e9ce26e404c1f404c280
2010-08-24 15:40:50 -07:00
Andreas Huber
3087ca8681
Merge "A first shot at proper support for seeking of rtsp streams." into gingerbread
2010-08-24 15:01:14 -07:00
Dianne Hackborn
6f4b2fbdb9
Merge "Verify that onPause() calls its superclass." into gingerbread
2010-08-24 14:44:42 -07:00
