Daniel Sandler
bb7f6ad52f
am 26d7aea7: am 044602b2: Merge "Ticker visual fixes." into honeycomb
...
* commit '26d7aea7b7bd4439cf85ea0a2d2d58b05a0f4642':
Ticker visual fixes.
2011-01-26 12:55:16 -08:00
Daniel Sandler
26d7aea7b7
am 044602b2: Merge "Ticker visual fixes." into honeycomb
...
* commit '044602b226638e92907fbd573723772856256259':
Ticker visual fixes.
2011-01-26 12:53:58 -08:00
Dharmaray Kundargi
7a58635e84
am 666b9eb3: am 45e3d123: Merge "Overlay java files Issue 3370836" into honeycomb
...
* commit '666b9eb3a260034c85e2a6eaa5e8f4ceea968f33':
Overlay java files Issue 3370836
2011-01-26 12:52:05 -08:00
Dharmaray Kundargi
5af2ce4c5f
am 81bebad0: am ecebf173: Merge "Fix for Issue 3370836 : JNI files for Overlay optmization." into honeycomb
...
* commit '81bebad0f1fa0bda5a74e4e78b43bd94bd94bf40':
Fix for Issue 3370836 : JNI files for Overlay optmization.
2011-01-26 12:51:58 -08:00
Daniel Sandler
044602b226
Merge "Ticker visual fixes." into honeycomb
2011-01-26 12:51:30 -08:00
Dharmaray Kundargi
666b9eb3a2
am 45e3d123: Merge "Overlay java files Issue 3370836" into honeycomb
...
* commit '45e3d123bce32a8b1f469d366ebb1d3f9ccb2bfc':
Overlay java files Issue 3370836
2011-01-26 12:48:32 -08:00
Dharmaray Kundargi
81bebad0f1
am ecebf173: Merge "Fix for Issue 3370836 : JNI files for Overlay optmization." into honeycomb
...
* commit 'ecebf173deca568aa44f4fc29968e10c78ad7571':
Fix for Issue 3370836 : JNI files for Overlay optmization.
2011-01-26 12:48:28 -08:00
Dharmaray Kundargi
45e3d123bc
Merge "Overlay java files Issue 3370836" into honeycomb
2011-01-26 12:46:23 -08:00
Dharmaray Kundargi
ecebf173de
Merge "Fix for Issue 3370836 : JNI files for Overlay optmization." into honeycomb
2011-01-26 12:46:20 -08:00
Mathias Agopian
a135040311
am 947bbc91: am a0f40033: Merge "fix [3385504] Surface flinger hang when adding dim surface" into honeycomb
...
* commit '947bbc914a3c6723dcd8ff1fcca2fc61e557bacc':
fix [3385504] Surface flinger hang when adding dim surface
2011-01-26 12:44:47 -08:00
Mathias Agopian
947bbc914a
am a0f40033: Merge "fix [3385504] Surface flinger hang when adding dim surface" into honeycomb
...
* commit 'a0f40033c03a0b64538bf1c22f83d3c9a325ff87':
fix [3385504] Surface flinger hang when adding dim surface
2011-01-26 12:43:16 -08:00
Mathias Agopian
a0f40033c0
Merge "fix [3385504] Surface flinger hang when adding dim surface" into honeycomb
2011-01-26 12:41:02 -08:00
Winson Chung
dd071fea23
am 38fe6ff4: am 2c070bae: Merge "Re-enabling queued unbinding of services after requests to the service. (3394210)" into honeycomb
...
* commit '38fe6ff45a6cbc328d1b92c9b9d79c65c3fb29ae':
Re-enabling queued unbinding of services after requests to the service. (3394210)
2011-01-26 12:35:21 -08:00
Winson Chung
38fe6ff45a
am 2c070bae: Merge "Re-enabling queued unbinding of services after requests to the service. (3394210)" into honeycomb
...
* commit '2c070bae4493cd1976c5086ec4cbf6ce10482742':
Re-enabling queued unbinding of services after requests to the service. (3394210)
2011-01-26 12:32:50 -08:00
Winson Chung
2c070bae44
Merge "Re-enabling queued unbinding of services after requests to the service. (3394210)" into honeycomb
2011-01-26 12:30:26 -08:00
Jaikumar Ganesh
3b4c86af20
am 48f73779: am e9b644fc: Merge "Fix some unmatched javadoc tags." into honeycomb
...
* commit '48f737798070471cefeeaf418c75ea55f8b925e9':
Fix some unmatched javadoc tags.
2011-01-26 12:27:58 -08:00
Daniel Sandler
6aa2d3a166
Ticker visual fixes.
...
- Includes the correct ticker background image, finally
- Confines the ticker height to 48dp (status bar height)
- Aligns the ticker to the bottom of the screen
Bug: 3361133
Change-Id: I9497f29d2b4c1cbcb195f0e66393f6db97d01ee2
2011-01-26 15:25:36 -05:00
Jaikumar Ganesh
48f7377980
am e9b644fc: Merge "Fix some unmatched javadoc tags." into honeycomb
...
* commit 'e9b644fcef08b0716efd3843ca7152e75cde3447':
Fix some unmatched javadoc tags.
2011-01-26 12:25:29 -08:00
Jaikumar Ganesh
e9b644fcef
Merge "Fix some unmatched javadoc tags." into honeycomb
2011-01-26 12:23:15 -08:00
Andreas Huber
17c914a067
am 11934aa3: am 373d357a: Merge "More instrumentation to track down the hardware decoder not shutting down bug." into honeycomb
...
* commit '11934aa32102d56ea920b058cb3cc9a455cd2232':
More instrumentation to track down the hardware decoder not shutting down bug.
2011-01-26 12:12:33 -08:00
Andreas Huber
bd36c2230b
am 1a6e6d55: am 6df89fde: Merge "Ignore errors returned from native_window_set_crop." into honeycomb
...
* commit '1a6e6d55b8dd33b3bd2b52849d39ef96b556b52f':
Ignore errors returned from native_window_set_crop.
2011-01-26 12:12:28 -08:00
Andreas Huber
11934aa321
am 373d357a: Merge "More instrumentation to track down the hardware decoder not shutting down bug." into honeycomb
...
* commit '373d357a8b13dc2cdc82d9e1d6144fb26e3bb202':
More instrumentation to track down the hardware decoder not shutting down bug.
2011-01-26 12:10:00 -08:00
Andreas Huber
1a6e6d55b8
am 6df89fde: Merge "Ignore errors returned from native_window_set_crop." into honeycomb
...
* commit '6df89fde0db446bb530ab872b373b1faa3ccb06c':
Ignore errors returned from native_window_set_crop.
2011-01-26 12:09:56 -08:00
Winson Chung
16c8d8a558
Re-enabling queued unbinding of services after requests to the service. (3394210)
...
- Fix for crash when detaching from window
- Potential fix for occasional IllegalStateException when updating List based widgets
Change-Id: I3d3f2bb691552a1136111043db686c4926b510c6
2011-01-26 12:09:27 -08:00
Andreas Huber
373d357a8b
Merge "More instrumentation to track down the hardware decoder not shutting down bug." into honeycomb
2011-01-26 12:08:09 -08:00
Andreas Huber
6df89fde0d
Merge "Ignore errors returned from native_window_set_crop." into honeycomb
2011-01-26 12:06:39 -08:00
Andreas Huber
06be3b14c9
More instrumentation to track down the hardware decoder not shutting down bug.
...
Change-Id: I3f31b6fdf5c90b436567bbce578dcbc4666ed7c2
related-to-bug: 3362836
2011-01-26 12:04:06 -08:00
Andreas Huber
00d6c725ec
Ignore errors returned from native_window_set_crop.
...
If the surface is already invalid, we'll know soon enough.
Change-Id: If360ffb8293817afb47df8c1a75722aea74bb335
related-to-bug: 3394601
2011-01-26 12:02:35 -08:00
Jason Sams
78c329008e
am 83af7012: (-s ours) am e0fc4b70: Merge "DO NOT MERGE Remove the rs_quaternion functions until mr1" into honeycomb
...
* commit '83af70126f2408b3ec835a20a745502789458c7a':
DO NOT MERGE Remove the rs_quaternion functions until mr1
2011-01-26 11:59:14 -08:00
Jason Sams
5252aeb56b
am 2e42038d: am e361ca64: Merge "Migrating functions for on device linking." into honeycomb
...
* commit '2e42038d4efe9b859fc536c7e5283b9a0e2e17dd':
Migrating functions for on device linking.
2011-01-26 11:59:10 -08:00
Jason Sams
83af70126f
am e0fc4b70: Merge "DO NOT MERGE Remove the rs_quaternion functions until mr1" into honeycomb
...
* commit 'e0fc4b70f812cef4c8850be91b008e75b28757f3':
DO NOT MERGE Remove the rs_quaternion functions until mr1
2011-01-26 11:57:12 -08:00
Jason Sams
2e42038d4e
am e361ca64: Merge "Migrating functions for on device linking." into honeycomb
...
* commit 'e361ca6428e137410ab828f5dee6148b8bdc29b3':
Migrating functions for on device linking.
2011-01-26 11:57:08 -08:00
Robert Greenwalt
9e751f0fb5
Merge "Make the interface with DHCP IPv6 capable."
2011-01-26 11:56:19 -08:00
Jason Sams
e0fc4b70f8
Merge "DO NOT MERGE Remove the rs_quaternion functions until mr1" into honeycomb
2011-01-26 11:54:38 -08:00
Jason Sams
e361ca6428
Merge "Migrating functions for on device linking." into honeycomb
2011-01-26 11:54:33 -08:00
Joe Onorato
b648c60854
am a4a5ec5e: am 1aadb210: Merge changes I48392c75,Id09437a4,I4a0aa878 into honeycomb
...
* commit 'a4a5ec5e748f99c40301c9c422b3d36cb44c6081':
Expose the window flags for lights out mode.
Make TabletStatusBar call into StatusBarManagerService when it goes out of lights out mode on its own.
Make FLAG_FULLSCREEN not go into lights out mode anymore.
2011-01-26 11:50:38 -08:00
Joe Onorato
a4a5ec5e74
am 1aadb210: Merge changes I48392c75,Id09437a4,I4a0aa878 into honeycomb
...
* commit '1aadb2108d7614d9d1ff61b41c6c31cb8d211ab9':
Expose the window flags for lights out mode.
Make TabletStatusBar call into StatusBarManagerService when it goes out of lights out mode on its own.
Make FLAG_FULLSCREEN not go into lights out mode anymore.
2011-01-26 11:48:48 -08:00
Andreas Huber
c397566492
am e328d1c0: am a9f27fa6: Merge "Protect notification callback parameters with a mutex." into honeycomb
...
* commit 'e328d1c0bea62f4dc28210dbcab0da40f4449bf2':
Protect notification callback parameters with a mutex.
2011-01-26 11:48:12 -08:00
Andreas Huber
dca5cb3204
am 38a1714b: am 7765c65d: Merge "Linux sockets suck, closing a socket descriptor does not abort pending recv/send calls." into honeycomb
...
* commit '38a1714bf79821dad296eeddfda1b6a7ce93ebbd':
Linux sockets suck, closing a socket descriptor does not abort pending recv/send calls.
2011-01-26 11:48:07 -08:00
Andreas Huber
36fc650bd8
am 807398e7: am d030359f: Merge "Instead of not feeding the AudioTrack any data after EOS, play silence instead." into honeycomb
...
* commit '807398e7f0718aaa9e8f53c556d0707c083819cf':
Instead of not feeding the AudioTrack any data after EOS, play silence instead.
2011-01-26 11:48:01 -08:00
Joe Onorato
1aadb2108d
Merge changes I48392c75,Id09437a4,I4a0aa878 into honeycomb
...
* changes:
Expose the window flags for lights out mode.
Make TabletStatusBar call into StatusBarManagerService when it goes out of lights out mode on its own.
Make FLAG_FULLSCREEN not go into lights out mode anymore.
2011-01-26 11:46:58 -08:00
Jaikumar Ganesh
0706fed520
Fix some unmatched javadoc tags.
...
Bug: 3392175
Change-Id: I84aa86c07060bc4ba399fd5c8f7cda162b432031
2011-01-26 11:46:56 -08:00
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
Kenny Root
bd549fe0bb
am 7dbf0696: resolved conflicts for merge of 2c1d0967 to honeycomb-plus-aosp
...
* commit '7dbf0696ef37097f2bcec058f876f7f4ba63d357':
Make ObbActionListener a on-way call
2011-01-26 11:43:31 -08:00
Dharmaray Kundargi
9c077e44c0
Overlay java files Issue 3370836
...
Change-Id: If062ad12dc2f5faf58936436527234ce80dffad9
2011-01-26 11:35:29 -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