Andreas Huber
e328d1c0be
am a9f27fa6: Merge "Protect notification callback parameters with a mutex." into honeycomb
...
* commit 'a9f27fa631ab21d52c75842ccaacc1cbcd75fca0':
Protect notification callback parameters with a mutex.
2011-01-26 11:44:17 -08:00
Andreas Huber
38a1714bf7
am 7765c65d: Merge "Linux sockets suck, closing a socket descriptor does not abort pending recv/send calls." into honeycomb
...
* commit '7765c65dbe1ba8f2229f2fec5a83ba2d1da79733':
Linux sockets suck, closing a socket descriptor does not abort pending recv/send calls.
2011-01-26 11:44:11 -08:00
Andreas Huber
807398e7f0
am d030359f: Merge "Instead of not feeding the AudioTrack any data after EOS, play silence instead." into honeycomb
...
* commit 'd030359ff10a031c762d4f229d9c1bdfd366cb50':
Instead of not feeding the AudioTrack any data after EOS, play silence instead.
2011-01-26 11:43:50 -08:00
Andreas Huber
a9f27fa631
Merge "Protect notification callback parameters with a mutex." into honeycomb
2011-01-26 11:28:01 -08:00
Andreas Huber
7765c65dbe
Merge "Linux sockets suck, closing a socket descriptor does not abort pending recv/send calls." into honeycomb
2011-01-26 11:24:13 -08:00
Andreas Huber
2ffbb18053
Protect notification callback parameters with a mutex.
...
This avoids the race condition where notifications are dispatched to a NULL receiver
after notifications have been disabled.
Change-Id: I6d351ffbee97616e2c35559c132a6c5e6a66948a
related-to-bug: 3394139
2011-01-26 11:20:42 -08:00
Andreas Huber
d030359ff1
Merge "Instead of not feeding the AudioTrack any data after EOS, play silence instead." into honeycomb
2011-01-26 11:11:50 -08:00
Kenny Root
7dbf0696ef
resolved conflicts for merge of 2c1d0967 to honeycomb-plus-aosp
...
Change-Id: Ie9b0166b0260ee7eea7bdd275e64f2714024bf1c
2011-01-26 11:10:36 -08:00
Kenny Root
2c1d0967ba
Merge "Make ObbActionListener a on-way call" into honeycomb
2011-01-26 11:01:14 -08:00
Romain Guy
7c55da5db5
am f5b27e35: Merge "Fix NPE in YouTube. Bug #3385339 " into honeycomb
...
* commit 'f5b27e35c1e0e46ffd882606d0783875e1a1ff7b':
Fix NPE in YouTube. Bug #3385339
2011-01-26 10:56:08 -08:00
Romain Guy
f5b27e35c1
Merge "Fix NPE in YouTube. Bug #3385339 " into honeycomb
2011-01-26 10:54:23 -08:00
Romain Guy
d30b36d3cd
Fix NPE in YouTube.
...
Bug #3385339
Change-Id: Id7b307994e343cdb808161a7fae590536f04252e
2011-01-26 10:54:43 -08:00
Jeff Brown
f0ea11d712
am 8b557459: Merge "Fix emulator touchscreen." into honeycomb
...
* commit '8b557459da3e1ac27d8aaa527be2eb795e61d926':
Fix emulator touchscreen.
2011-01-26 10:48:22 -08:00
Jeff Brown
8b557459da
Merge "Fix emulator touchscreen." into honeycomb
2011-01-26 10:46:29 -08:00
Andreas Huber
4aeec2da39
Instead of not feeding the AudioTrack any data after EOS, play silence instead.
...
Change-Id: I9aa797cf5bb58eefed51d732f4e5d09450551158
related-to-bug: 3347428
2011-01-26 10:41:38 -08:00
Jeff Brown
77ef8b5061
Fix emulator touchscreen.
...
Bug: 3393763
Change-Id: Ief16640344d61d283aac08ef4b53e85d7ee3c73f
2011-01-26 10:40:10 -08:00
Shih-wei Liao
969b3ae440
am 39740e1e: Merge "Fix b/2943524: On-device linking the rs_cl." into honeycomb
...
* commit '39740e1e96baa9db399ef2bdc236974b3ae049af':
Fix b/2943524: On-device linking the rs_cl.
2011-01-26 10:39:46 -08:00
Shih-wei Liao
39740e1e96
Merge "Fix b/2943524: On-device linking the rs_cl." into honeycomb
2011-01-26 10:37:08 -08:00
Wink Saville
c3a2747fee
am d8b525c3: Merge "Increase the default timeout from 30 to 60 seconds." into honeycomb
...
* commit 'd8b525c398aeda1f583ed4ed90450e0a0fc9b6ef':
Increase the default timeout from 30 to 60 seconds.
2011-01-26 10:16:43 -08:00
Andreas Huber
231640950e
Linux sockets suck, closing a socket descriptor does not abort pending recv/send calls.
...
Change-Id: Id53e7831761619f72ddc61f63571230011c93f16
related-to-bug: 3362836
2011-01-26 10:14:38 -08:00
Wink Saville
d8b525c398
Merge "Increase the default timeout from 30 to 60 seconds." into honeycomb
2011-01-26 10:14:20 -08:00
Kenny Root
ff271a2288
am 2ec4af59: am 138757db: Merge "Make OBB results a one-way call" into gingerbread
...
* commit '2ec4af59209ab3a7088a001bbbcb10ef0b846564':
Make OBB results a one-way call
2011-01-26 10:11:21 -08:00
Leon Scroggins
666158e09b
am 8b2d4825: Merge "Move last touch point when moving the cursor node." into honeycomb
...
* commit '8b2d4825e1d7ca22aab9ae9fdfa1ecd34f154e22':
Move last touch point when moving the cursor node.
2011-01-26 10:08:17 -08:00
Leon Scroggins
8b2d4825e1
Merge "Move last touch point when moving the cursor node." into honeycomb
2011-01-26 10:06:42 -08:00
Daniel Sandler
f96e0eb49f
am 66a9f48b: Merge "Wrong clock font in system bar. Whoops." into honeycomb
...
* commit '66a9f48bbf9c2dfc25c1e520fcc05e3d5c2abe84':
Wrong clock font in system bar. Whoops.
2011-01-26 09:37:34 -08:00
Daniel Sandler
66a9f48bbf
Merge "Wrong clock font in system bar. Whoops." into honeycomb
2011-01-26 09:35:03 -08:00
Kenny Root
2ec4af5920
am 138757db: Merge "Make OBB results a one-way call" into gingerbread
...
* commit '138757db4f19cb626ef5c1d371d4fca004304a08':
Make OBB results a one-way call
2011-01-26 09:25:43 -08:00
Wink Saville
b260fe75c1
Increase the default timeout from 30 to 60 seconds.
...
The DEFAULT_WAKE_LOCK_TIMEOUT should be longer than the timeouts
of the vendor ril, aka. rild. We are seeing timeouts which are
30secs and possibly longer. An alternative would be to add
TelephonyManager.PROPERTY_WAKE_LOCK_TIMEOUT for but I feel a 60
second default is appropriate for all platforms.
Bug: 3392618
Change-Id: I63f6b211b584857999174524d4ea4efa1994dfba
2011-01-26 09:21:32 -08:00
Jaikumar Ganesh
b774f261ea
am ff3b3ade: Merge "Revert "Temporary Changes for certification of SCO."" into honeycomb
...
* commit 'ff3b3ade7fa1da60d391d1a746cdc0868c24f4bf':
Revert "Temporary Changes for certification of SCO."
2011-01-26 09:19:31 -08:00
Kenny Root
138757db4f
Merge "Make OBB results a one-way call" into gingerbread
2011-01-26 09:17:28 -08:00
Jaikumar Ganesh
ff3b3ade7f
Merge "Revert "Temporary Changes for certification of SCO."" into honeycomb
2011-01-26 09:16:07 -08:00
Justin Ho
721a225339
am 93a0110e: Merge "New stat_notify icons in hdpi and mdpi" into honeycomb
...
* commit '93a0110e94da1144d949fc06070ba8250f9a1825':
New stat_notify icons in hdpi and mdpi
2011-01-26 09:14:57 -08:00
Justin Ho
93a0110e94
Merge "New stat_notify icons in hdpi and mdpi" into honeycomb
2011-01-26 09:12:01 -08:00
Jaikumar Ganesh
5a9ac240fe
Revert "Temporary Changes for certification of SCO."
...
This reverts commit 75c2701454f4506664d9056988c8ce5fd0ca73ba.
Change-Id: Ic63cdbbb06b9ed2d9c48e8b29cc376059ecadebf
2011-01-26 09:08:50 -08:00
Jaikumar Ganesh
b8a1a415f3
am 8ef1179e: Merge "Improve readability of java docs for the public APIs." into honeycomb
...
* commit '8ef1179efce1c8b1107df707afdce8f85404d39e':
Improve readability of java docs for the public APIs.
2011-01-26 09:04:47 -08:00
Jaikumar Ganesh
8ef1179efc
Merge "Improve readability of java docs for the public APIs." into honeycomb
2011-01-26 09:02:12 -08:00
Justin Ho
ecf62d76e8
New stat_notify icons in hdpi and mdpi
...
Change-Id: I8e1eee2921411f5ed8d404c39dbfc9ac4977ef37
2011-01-26 08:48:48 -08:00
Daniel Sandler
e378a7514b
Wrong clock font in system bar. Whoops.
...
Bug: 3385564
Change-Id: I7231e9f7494bce436e93aed9793770cff40841a4
2011-01-26 11:46:01 -05:00
Leon Scroggins
cef1c59efc
Move last touch point when moving the cursor node.
...
Bug:3241968
Bug:3387455
The code was already in place, but needs to happen before we
return if mHeightCanMeasure == false.
Change-Id: Ic07dac4c4471bf4e2189f3fee322adeb23703f41
2011-01-26 11:13:24 -05:00
Justin Ho
2962f7a9f3
am 1e0bad61: Updating phone assets to Gingerbread Integrating new stat_notify in SystemUI
...
* commit '1e0bad6156f2ae19b87519c2b3e2ccf7aba93d66':
Updating phone assets to Gingerbread Integrating new stat_notify in SystemUI
2011-01-26 08:08:21 -08:00
Justin Ho
1e0bad6156
Updating phone assets to Gingerbread
...
Integrating new stat_notify in SystemUI
Change-Id: Ib626847a050b255ee63092b84f59ce83ed174379
2011-01-26 07:39:16 -08:00
Justin Ho
f2d3d9f52a
am 9286bb5b: Merge "Removing unused assets" into honeycomb
...
* commit '9286bb5bd550793e3a9cee2aa689842100794585':
Removing unused assets
2011-01-26 07:31:00 -08:00
Justin Ho
9286bb5bd5
Merge "Removing unused assets" into honeycomb
2011-01-26 07:26:40 -08:00
Chet Haase
b69e985b9a
am ace9233b: Merge "Fix invalidation problem with display lists" into honeycomb
...
* commit 'ace9233b11e9be0d894fcf36cdee4c6b0a20d3bd':
Fix invalidation problem with display lists
2011-01-26 06:32:59 -08:00
Chet Haase
ace9233b11
Merge "Fix invalidation problem with display lists" into honeycomb
2011-01-26 06:30:48 -08:00
Patrick Scott
ac9bda01b1
am c45ec344: Merge "Turn off picture splitting for now." into honeycomb
...
* commit 'c45ec3440bcdc00542e5e08cfa7ba29593cb7609':
Turn off picture splitting for now.
2011-01-26 05:51:07 -08:00
Patrick Scott
c45ec3440b
Merge "Turn off picture splitting for now." into honeycomb
2011-01-26 05:48:53 -08:00
Shih-wei Liao
2fd2c894e9
Fix b/2943524: On-device linking the rs_cl.
...
Change-Id: I1b1e76ec94a26e0bc86d997d2584c8a015c57de1
2011-01-26 04:03:30 -08:00
satok
e2f32bc938
am 71353f36: Merge "Update input method panel when packages are changed." into honeycomb
...
* commit '71353f367185a254238ffa56c1e158a48d3b28cb':
Update input method panel when packages are changed.
2011-01-26 02:10:32 -08:00
satok
71353f3671
Merge "Update input method panel when packages are changed." into honeycomb
2011-01-26 02:08:48 -08:00