Adam Cohen
5c9288cee6
am 10f27c5a: Merge "Fixing bug where widgets would go dead after moving to another screen" into honeycomb
...
* commit '10f27c5a42e6da262d178d426944b2b31c185f4a':
Fixing bug where widgets would go dead after moving to another screen
2011-01-26 13:29:07 -08:00
Adam Cohen
ef66a36846
Merge "Fixing bug where widgets would go dead after moving to another screen" into honeycomb
2011-01-26 13:26:58 -08:00
Shimeng (Simon) Wang
68d66a4ca4
am 07837862: Merge "Fine tune the high memory threshold and usage delta for v8 GC." into honeycomb
...
* commit '078378624c1955a1e842af34f79798918edccc21':
Fine tune the high memory threshold and usage delta for v8 GC.
2011-01-26 13:25:50 -08:00
Shimeng (Simon) Wang
5aa66b68d2
Merge "Fine tune the high memory threshold and usage delta for v8 GC." into honeycomb
2011-01-26 13:23:58 -08:00
Justin Ho
8fa2997edc
am 8a445fc3: Merge "Integrating drawable-xlarge stat_sys assets" into honeycomb
...
* commit '8a445fc30e45c1f7a9805ae19948ec32786458a0':
Integrating drawable-xlarge stat_sys assets
2011-01-26 13:04:18 -08:00
Justin Ho
362d419c91
Merge "Integrating drawable-xlarge stat_sys assets" into honeycomb
2011-01-26 13:02:01 -08:00
Daniel Sandler
96701f6c2e
am 044602b2: Merge "Ticker visual fixes." into honeycomb
...
* commit '044602b226638e92907fbd573723772856256259':
Ticker visual fixes.
2011-01-26 12:53:58 -08:00
Daniel Sandler
5d87d2e82d
Merge "Ticker visual fixes." into honeycomb
2011-01-26 12:51:30 -08:00
Dharmaray Kundargi
706fff9241
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
65e516ed11
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
7cd73018d3
Merge "Overlay java files Issue 3370836" into honeycomb
2011-01-26 12:46:23 -08:00
Dharmaray Kundargi
6bd4df9265
Merge "Fix for Issue 3370836 : JNI files for Overlay optmization." into honeycomb
2011-01-26 12:46:20 -08:00
Mathias Agopian
aebc3fa75f
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
b42757b262
Merge "fix [3385504] Surface flinger hang when adding dim surface" into honeycomb
2011-01-26 12:41:02 -08:00
Winson Chung
3db4c71315
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
5085c0f055
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
c0200c74bb
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
9e9bd95624
Merge "Fix some unmatched javadoc tags." into honeycomb
2011-01-26 12:23:15 -08:00
Andreas Huber
7ae6e78f09
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
7ab2d67b6c
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
Andreas Huber
f55cb8a261
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
af514cd1c2
Merge "Ignore errors returned from native_window_set_crop." into honeycomb
2011-01-26 12:06:39 -08:00
Jason Sams
31f6cea70a
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
376ad326c1
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
Jason Sams
9e4b4f5b1f
Merge "DO NOT MERGE Remove the rs_quaternion functions until mr1" into honeycomb
2011-01-26 11:54:38 -08:00
Jason Sams
1afd847713
Merge "Migrating functions for on device linking." into honeycomb
2011-01-26 11:54:33 -08:00
Joe Onorato
9a9b18dcae
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
Joe Onorato
e53ebac0df
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
Andreas Huber
69993edb08
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
68cb793b7d
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
f7b13c803d
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
d9f39c74b8
Merge "Protect notification callback parameters with a mutex." into honeycomb
2011-01-26 11:28:01 -08:00
Andreas Huber
bdb1d2fb52
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
74f340a126
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
c2625b69a3
resolved conflicts for merge of 2c1d0967 to honeycomb-plus-aosp
...
Change-Id: Ie9b0166b0260ee7eea7bdd275e64f2714024bf1c
2011-01-26 11:10:36 -08:00
Kenny Root
6c047479e1
Merge "Make ObbActionListener a on-way call" into honeycomb
2011-01-26 11:01:14 -08:00
Romain Guy
312e8000c7
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
28988b0f74
Merge "Fix NPE in YouTube. Bug #3385339 " into honeycomb
2011-01-26 10:54:23 -08:00
Jeff Brown
4be4c563e2
am 8b557459: Merge "Fix emulator touchscreen." into honeycomb
...
* commit '8b557459da3e1ac27d8aaa527be2eb795e61d926':
Fix emulator touchscreen.
2011-01-26 10:48:22 -08:00
Jeff Brown
1ae20c99f8
Merge "Fix emulator touchscreen." into honeycomb
2011-01-26 10:46:29 -08:00
Shih-wei Liao
3c0d9d450b
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
5ca08ffd5b
Merge "Fix b/2943524: On-device linking the rs_cl." into honeycomb
2011-01-26 10:37:08 -08:00
Wink Saville
04cc9a9cd1
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
Wink Saville
ae36db5b77
Merge "Increase the default timeout from 30 to 60 seconds." into honeycomb
2011-01-26 10:14:20 -08:00
Kenny Root
034f99e65e
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
2ed52e1b14
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
552340abef
Merge "Move last touch point when moving the cursor node." into honeycomb
2011-01-26 10:06:42 -08:00
Daniel Sandler
1719f612fd
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
c6f2f246c9
Merge "Wrong clock font in system bar. Whoops." into honeycomb
2011-01-26 09:35:03 -08:00
Kenny Root
73fa8add77
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