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
Jaikumar Ganesh
04d44648aa
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
30acaa8851
Merge "Make OBB results a one-way call" into gingerbread
2011-01-26 09:17:28 -08:00
Jaikumar Ganesh
6f35c47d29
Merge "Revert "Temporary Changes for certification of SCO."" into honeycomb
2011-01-26 09:16:07 -08:00
Justin Ho
b3b588b66d
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
889d84ae64
Merge "New stat_notify icons in hdpi and mdpi" into honeycomb
2011-01-26 09:12:01 -08:00
Jaikumar Ganesh
e44e9e57e0
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
ded708ffa2
Merge "Improve readability of java docs for the public APIs." into honeycomb
2011-01-26 09:02:12 -08:00
Justin Ho
fcc17adb20
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
61f1b236e4
am 9286bb5b: Merge "Removing unused assets" into honeycomb
...
* commit '9286bb5bd550793e3a9cee2aa689842100794585':
Removing unused assets
2011-01-26 07:31:00 -08:00
Justin Ho
8dd0f0789c
Merge "Removing unused assets" into honeycomb
2011-01-26 07:26:40 -08:00
Chet Haase
fa9fa277a5
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
7088df245b
Merge "Fix invalidation problem with display lists" into honeycomb
2011-01-26 06:30:48 -08:00
Patrick Scott
34ad043811
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
2a25b07d31
Merge "Turn off picture splitting for now." into honeycomb
2011-01-26 05:48:53 -08:00
satok
2c1bb606b7
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
5d77cd9bb4
Merge "Update input method panel when packages are changed." into honeycomb
2011-01-26 02:08:48 -08:00
Romain Guy
cd4b05344f
am b6110a1e: Merge "Make sure the opaque bitmap is opaque. GL doesn\'t like being lied to. Bug #3382992 " into honeycomb
...
* commit 'b6110a1ef41337a5f3042c7e08b63274cee4faf6':
Make sure the opaque bitmap is opaque. GL doesn't like being lied to. Bug #3382992
2011-01-25 22:56:10 -08:00
Romain Guy
aa90944888
Merge "Make sure the opaque bitmap is opaque. GL doesn't like being lied to. Bug #3382992 " into honeycomb
2011-01-25 22:54:06 -08:00
Santosh Madhava
0ca3499ef5
am 4991a00b: Merge "Review rework for issue 3385068 : Play gets out of sync" into honeycomb
...
* commit '4991a00b28ea17941681396ec5dfc62a53408158':
Review rework for issue 3385068 : Play gets out of sync
2011-01-25 22:46:41 -08:00