24624 Commits

Author SHA1 Message Date
Mathias Agopian
64f7549b0e Merge "fix [2712278] The preview buffer left some black borders in left and bottom edges" into kraken 2010-05-25 17:56:07 -07:00
Mathias Agopian
2ce19af45b fix [2712278] The preview buffer left some black borders in left and bottom edges
we were incorrectly flagging push_buffer surfaces as invalid

Change-Id: I4dfd4ffbbe8a71f7e23e835db8d71966416c29bb
2010-05-25 17:51:34 -07:00
Yu Shan Emily Lau
393f5698a0 am f35ce7f8: am 6e0967b3: am b0016e2b: Merge "Added the runtime parameters for the mediarecorder stress test. Set the total number of the stress loops of camera preview memory test to 200." into froyo 2010-05-25 17:46:46 -07:00
Yu Shan Emily Lau
f35ce7f8ee am 6e0967b3: am b0016e2b: Merge "Added the runtime parameters for the mediarecorder stress test. Set the total number of the stress loops of camera preview memory test to 200." into froyo
Merge commit '6e0967b3c4561e188df72f478baf16c6627b12be' into kraken

* commit '6e0967b3c4561e188df72f478baf16c6627b12be':
  Added the runtime parameters for the mediarecorder stress test.
2010-05-25 17:44:46 -07:00
Yu Shan Emily Lau
6e0967b3c4 am b0016e2b: Merge "Added the runtime parameters for the mediarecorder stress test. Set the total number of the stress loops of camera preview memory test to 200." into froyo
Merge commit 'b0016e2b2162c916289d022f1572c0bc95158543' into froyo-plus-aosp

* commit 'b0016e2b2162c916289d022f1572c0bc95158543':
  Added the runtime parameters for the mediarecorder stress test.
2010-05-25 17:42:29 -07:00
Yu Shan Emily Lau
b0016e2b21 Merge "Added the runtime parameters for the mediarecorder stress test. Set the total number of the stress loops of camera preview memory test to 200." into froyo 2010-05-25 17:40:51 -07:00
Jim Miller
14f56a0bd7 am b35cd7dd: Merge "Fix 2667859: change text back to default size" into kraken 2010-05-25 17:14:50 -07:00
Jim Miller
b35cd7dde5 Merge "Fix 2667859: change text back to default size" into kraken 2010-05-25 17:13:18 -07:00
Jim Miller
bae698cd54 Fix 2667859: change text back to default size
This reverts a change described in the above bug where
the font size got changed to 22dip.

Change-Id: I42e2dc06e94aba003fa00032b265c986959ce939
2010-05-25 16:53:45 -07:00
Yu Shan Emily Lau
48584d7b8f Added the runtime parameters for the mediarecorder stress test.
Set the total number of the stress loops of camera preview memory test to 200.

Change-Id: I5a0278095155afd669ffee9bd599ddfffdcc42bf
2010-05-25 16:42:57 -07:00
Robert Greenwalt
3cd6a3e353 am ac53a8a1: am 88ccecf5: am d1055a25: Make the NTP Cache max-age gservices-settable 2010-05-25 16:17:23 -07:00
Robert Greenwalt
ac53a8a135 am 88ccecf5: am d1055a25: Make the NTP Cache max-age gservices-settable
Merge commit '88ccecf573a52648052bc9c7858f345776f76e0e' into kraken

* commit '88ccecf573a52648052bc9c7858f345776f76e0e':
  Make the NTP Cache max-age gservices-settable
2010-05-25 16:15:37 -07:00
Robert Greenwalt
88ccecf573 am d1055a25: Make the NTP Cache max-age gservices-settable
Merge commit 'd1055a250c00b0c2516ec406a8cf9a5ab1c0b7ae' into froyo-plus-aosp

* commit 'd1055a250c00b0c2516ec406a8cf9a5ab1c0b7ae':
  Make the NTP Cache max-age gservices-settable
2010-05-25 16:13:22 -07:00
Robert Greenwalt
d1055a250c Make the NTP Cache max-age gservices-settable
Trying to make Throttle polling more energy efficient.

bug:2708119
Change-Id: I2b75639e202dcbcee11047c43407a22de04ce350
2010-05-25 15:54:52 -07:00
Daisuke Miyakawa
a14aded514 Merge "Add KDDI/Softbank to available Shift_Jis mapping." 2010-05-25 15:22:35 -07:00
Derek Sollenberger
03e4891571 Refactoring more webview zoom code into ZoomManager.
This CL is #2 of multiple CL's to remove the zoom code
from webview and place it into webkit.ZoomManager. Each
commit is only part of the entire refactoring so there
are many ZoomManager.* variables still referenced from
WebView.

Change-Id: I21f6517dff46b65a277bc67120ffabe043098e5e
http://b/2671604
2010-05-25 18:04:06 -04:00
Andreas Huber
5f3004c1f5 am 779b9b82: am f7617d36: Merge "Support for thumbnail extraction in the Matroska extractor." into kraken 2010-05-25 14:20:46 -07:00
Andreas Huber
779b9b82af am f7617d36: Merge "Support for thumbnail extraction in the Matroska extractor." into kraken 2010-05-25 14:19:13 -07:00
Andreas Huber
f7617d3601 Merge "Support for thumbnail extraction in the Matroska extractor." into kraken 2010-05-25 14:16:23 -07:00
Daisuke Miyakawa
df3f1cc3fe Add KDDI/Softbank to available Shift_Jis mapping.
Bug: 2689523
Change-Id: I5140bd02a5e30b323eb19b1b0eb2dcf17027f878
2010-05-25 14:10:09 -07:00
Andreas Huber
6bdf2edba4 Support for thumbnail extraction in the Matroska extractor.
Change-Id: I56f13fc4868baffe0bb8c2484d2753c766a73960
related-to-bug: 2483739
2010-05-25 13:41:40 -07:00
Eric Laurent
2bdc3e1a2f am e205dd34: am 06169761: Merge "Fix the simulator build broken by commit 5fe37c6838de9fbd959ad19ba44aa3d00d1b4e6f" into kraken 2010-05-25 12:46:12 -07:00
Eric Laurent
e205dd34a5 am 06169761: Merge "Fix the simulator build broken by commit 5fe37c6838de9fbd959ad19ba44aa3d00d1b4e6f" into kraken 2010-05-25 12:44:08 -07:00
Eric Laurent
0616976128 Merge "Fix the simulator build broken by commit 5fe37c6838de9fbd959ad19ba44aa3d00d1b4e6f" into kraken 2010-05-25 12:42:53 -07:00
Eric Laurent
a9d635d608 Fix the simulator build broken by commit 5fe37c6838de9fbd959ad19ba44aa3d00d1b4e6f
Change-Id: Ibf6aebfec60cd7f807c3e49f0dbb5ab8e86bcdc1
2010-05-25 12:38:34 -07:00
Kristian Monsen
521d9a7986 Display index and count when running layout tests
Change-Id: I8b925784aead96a1be6344d654d0376dee2047eb
2010-05-25 20:12:47 +01:00
Marco Nelissen
bb3a8c5ea2 Merge "Allow root to set the mount state as well, so that the simulator can use the fake sd card." 2010-05-25 12:04:03 -07:00
Andreas Huber
19a0913a5b am 1a777cd4: am c6c62e12: Support for ogg(vorbis) metadata in stagefright including album art. 2010-05-25 11:35:18 -07:00
Andreas Huber
1a777cd44a am c6c62e12: Support for ogg(vorbis) metadata in stagefright including album art. 2010-05-25 11:33:39 -07:00
Wink Saville
97692e6da2 Merge "Add needsOtaServiceProvisioning to Phone." 2010-05-25 11:20:30 -07:00
Andreas Huber
c6c62e12c9 Support for ogg(vorbis) metadata in stagefright including album art.
Change-Id: I0c8c0136cebe2d2d97caabb7bc0c65be86329dbb
related-to-bug: 2713414
2010-05-25 11:20:29 -07:00
Eric Laurent
de5a036da7 Merge "Fix issue 2641884: Bluetooth volume is dependent on in call volume." 2010-05-25 10:25:48 -07:00
Eric Laurent
cc9c4242e3 Fix issue 2641884: Bluetooth volume is dependent on in call volume.
The problem is that the code in AudioPolicyManagerBase::checkAndSetVolume() that forces
voice volume to max when setting bluetooth SCO volume is not called if the bluetooth stream
volume did not actually change. So even if we re apply volumes when switching to bluetooth
device, the volume voice volume is not changed and remains what it was when routed to earpiece
What makes things worse on Passion is that stream volumes are limited when connected to bluetooth
and their actual value does not change as soon as they exceed the limit threshold.

Change-Id: I18265e5e6686db0a1f30fc37a31e2ecde4f3fbc6
2010-05-25 09:31:59 -07:00
Marco Nelissen
584f137c19 Allow root to set the mount state as well, so that the simulator
can use the fake sd card.

Change-Id: I9ac5329f976a6e466ef2d7123ca70670975c30e3
2010-05-25 09:05:56 -07:00
Leon Scroggins
eb51f3e340 Check for null before using Layout.
Bug 2713024

Change-Id: Iaad5c774fa1e16c341d481104f8fd38f7add3082
2010-05-25 11:33:03 -04:00
Kristian Monsen
dcea182c9a Merge "Merge WebKit at r59636: Added appcache/fallback.html to the ignore list." 2010-05-25 07:58:40 -07:00
Kristian Monsen
d0a89e3fc0 Merge "Merge WebKit at r59636: Update UA string" 2010-05-25 07:58:33 -07:00
Kristian Monsen
75be797b0c Merge WebKit at r59636: Added appcache/fallback.html to the ignore list.
Change-Id: Ic2cbb9e32022b0f7ee371984691b3c590d05667d
2010-05-25 15:51:22 +01:00
Mike Lockwood
752b14705e Merge "MTP: adjust ptptest app for changes in libusbhost API." 2010-05-25 05:22:45 -07:00
Mike Lockwood
4f92fffc71 MTP: adjust ptptest app for changes in libusbhost API.
Change-Id: I775e08c851a55d775b532129be11fb19515fbf6e
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-05-25 08:12:25 -04:00
Kristian Monsen
02263fd2f0 Merge WebKit at r59636: Update UA string
Change-Id: Ic5b0a03ad53f2e81f5aeb6e32b2f92902b83fdb2
2010-05-25 11:11:57 +01:00
Eric Laurent
c0f34386d6 Fix issue 2667797: [Audio Effect Framework] new base class and binder interfaces for effect control.
Added IEffect and IEffectClient binder interfaces to exchange effect module control
and status information between application and media server processes.

Change-Id: I10e8e894898e52ed9956a765d0ef7075eb2593af
2010-05-24 23:33:42 -07:00
Eric Laurent
2ce0a831d6 am 1b88fb16: am cf3fa85c: Merge "Fix issue 2667796: [Audio Effect Framework] Effect factory and libraries." into kraken 2010-05-24 23:27:02 -07:00
Eric Laurent
1b88fb1693 am cf3fa85c: Merge "Fix issue 2667796: [Audio Effect Framework] Effect factory and libraries." into kraken 2010-05-24 23:24:42 -07:00
Eric Laurent
cf3fa85cdb Merge "Fix issue 2667796: [Audio Effect Framework] Effect factory and libraries." into kraken 2010-05-24 23:23:29 -07:00
Mathias Agopian
c1600ae869 am 36893612: am d6ddcb7f: fix [2677468] some 3rd party GL ES apps get a 32-bits surface by default and fail 2010-05-24 19:13:52 -07:00
Mathias Agopian
36893612af am d6ddcb7f: fix [2677468] some 3rd party GL ES apps get a 32-bits surface by default and fail 2010-05-24 19:12:33 -07:00
Mathias Agopian
d6ddcb7f00 fix [2677468] some 3rd party GL ES apps get a 32-bits surface by default and fail
force all SurfaceView to 565

Change-Id: I8ebfa1239d8e4fa097c2e544677fb92fa20b39bd
2010-05-24 19:07:08 -07:00
Mathias Agopian
b00d12beae am 61a58708: am 2e948ca1: Merge "added the notion of fixed-size buffers" into kraken 2010-05-24 18:33:35 -07:00
Mathias Agopian
7cce3d3dcd am 27d2f0ca: am acdc44bb: Merge "fix a bug when reallocating a window\'s buffers is needed" into kraken 2010-05-24 18:33:31 -07:00