Robert Greenwalt
9be97a799f
Merge "resolved conflicts for merge of 3cd6a3e3 to master"
2010-05-26 11:40:53 -07:00
Dmitry Shmidt
79171a05f0
Merge "bugreport: wifi: Add list of networks"
2010-05-26 11:32:57 -07:00
Andreas Huber
9d07793e7e
am a581a776: Merge "Squashed commit of the following:" into kraken
2010-05-26 11:22:49 -07:00
Andreas Huber
caf11a838d
Merge "Squashed commit of the following:" into kraken
2010-05-26 11:21:06 -07:00
Robert Greenwalt
ff85651004
resolved conflicts for merge of 3cd6a3e3 to master
...
Change-Id: If3e45cc3494b2c52a1f1dcc19deff763a50498d7
2010-05-26 10:37:48 -07:00
Vasu Nori
6688660fe0
Merge "when sqlite returns SQLITE_OK on SQLITEStatement.execute(), ignore it"
2010-05-26 10:27:40 -07:00
Kristian Monsen
232403baf2
Merge "Display index and count when running layout tests"
2010-05-26 03:05:08 -07:00
Eric Laurent
fab6b48ed1
am 27a308d3: Merge "Fix issue 2667797: [Audio Effect Framework] new base class and binder interfaces for effect control." into kraken
2010-05-25 23:49:53 -07:00
Eric Laurent
4c2329c9a1
Merge "Fix issue 2667797: [Audio Effect Framework] new base class and binder interfaces for effect control." into kraken
2010-05-25 23:48:30 -07:00
Mathias Agopian
5a93f3ffba
am 64f7549b: Merge "fix [2712278] The preview buffer left some black borders in left and bottom edges" into kraken
2010-05-25 17:57:08 -07:00
Mathias Agopian
18d92c9c70
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
631f358d34
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
0f9929da64
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
b9949d299f
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
605cb756f8
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
d5fa4a9f4f
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
75119dd23f
am b35cd7dd: Merge "Fix 2667859: change text back to default size" into kraken
2010-05-25 17:14:50 -07:00
Jim Miller
6bd416f0bf
Merge "Fix 2667859: change text back to default size" into kraken
2010-05-25 17:13:18 -07:00
Robert Greenwalt
e57c323f7e
am ac53a8a1: am 88ccecf5: am d1055a25: Make the NTP Cache max-age gservices-settable
2010-05-25 16:17:23 -07:00
Robert Greenwalt
50d4522e4a
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
1a5fe61ee1
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
Daisuke Miyakawa
a85dc38b8e
Merge "Add KDDI/Softbank to available Shift_Jis mapping."
2010-05-25 15:22:35 -07:00
Andreas Huber
b0c7f6cb4e
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
bc1accfc1a
am f7617d36: Merge "Support for thumbnail extraction in the Matroska extractor." into kraken
2010-05-25 14:19:13 -07:00
Andreas Huber
60eef82e4d
Merge "Support for thumbnail extraction in the Matroska extractor." into kraken
2010-05-25 14:16:23 -07:00
Eric Laurent
9a90b98f7a
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
18f0405e75
am 06169761: Merge "Fix the simulator build broken by commit 5fe37c6838de9fbd959ad19ba44aa3d00d1b4e6f" into kraken
2010-05-25 12:44:08 -07:00
Eric Laurent
dee5c2a3dc
Merge "Fix the simulator build broken by commit 5fe37c6838de9fbd959ad19ba44aa3d00d1b4e6f" into kraken
2010-05-25 12:42:53 -07:00
Marco Nelissen
56bfd09900
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
9df565617c
am 1a777cd4: am c6c62e12: Support for ogg(vorbis) metadata in stagefright including album art.
2010-05-25 11:35:18 -07:00
Andreas Huber
ded634d7a2
am c6c62e12: Support for ogg(vorbis) metadata in stagefright including album art.
2010-05-25 11:33:39 -07:00
Wink Saville
54ff7c5c8d
Merge "Add needsOtaServiceProvisioning to Phone."
2010-05-25 11:20:30 -07:00
Eric Laurent
a35b639467
Merge "Fix issue 2641884: Bluetooth volume is dependent on in call volume."
2010-05-25 10:25:48 -07:00
Eric Laurent
0b6a930096
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
Kristian Monsen
38d9991dda
Merge "Merge WebKit at r59636: Added appcache/fallback.html to the ignore list."
2010-05-25 07:58:40 -07:00
Kristian Monsen
6d54fed1df
Merge "Merge WebKit at r59636: Update UA string"
2010-05-25 07:58:33 -07:00
Mike Lockwood
ff407e9724
Merge "MTP: adjust ptptest app for changes in libusbhost API."
2010-05-25 05:22:45 -07:00
Eric Laurent
1b686dab50
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
bbf19751b2
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
6420423695
Merge "Fix issue 2667796: [Audio Effect Framework] Effect factory and libraries." into kraken
2010-05-24 23:23:29 -07:00
Mathias Agopian
50a97e519e
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
d5b85b56f4
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
640492bc11
am 61a58708: am 2e948ca1: Merge "added the notion of fixed-size buffers" into kraken
2010-05-24 18:33:35 -07:00
Mathias Agopian
0cd11258b2
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
Mathias Agopian
5aaa5f8898
am 2e948ca1: Merge "added the notion of fixed-size buffers" into kraken
2010-05-24 18:32:05 -07:00
Mathias Agopian
972ddedb6a
am acdc44bb: Merge "fix a bug when reallocating a window\'s buffers is needed" into kraken
2010-05-24 18:31:59 -07:00
Mathias Agopian
97e8ff0b4b
Merge "added the notion of fixed-size buffers" into kraken
2010-05-24 18:30:35 -07:00
Mathias Agopian
2d156c269e
Merge "fix a bug when reallocating a window's buffers is needed" into kraken
2010-05-24 18:30:25 -07:00
Mathias Agopian
a138f89c5e
added the notion of fixed-size buffers
...
the new native_window_set_buffers_geometry allows
to specify a size and format for all buffers to be
dequeued. the buffer will be scalled to the window's
size.
Change-Id: I2c378b85c88d29cdd827a5f319d5c704d79ba381
2010-05-24 18:26:01 -07:00
Adam Powell
71c0c547a3
am 49551ca4: am 9a559970: am f67c874c: am 7e5e3745: Fix bug 2710825 - Prevent ExpandableListView from scrolling too far when expanding children.
2010-05-24 16:30:16 -07:00
