Dirk Dougherty
4c19fbe6fc
am 81662bc7: am f69fd4dd: am 4273ce19: Merge "Doc change: Suggest min keysize of 2048 for keys." into froyo
2010-05-26 18:37:11 -07:00
Dirk Dougherty
6d5ae81061
am f69fd4dd: am 4273ce19: Merge "Doc change: Suggest min keysize of 2048 for keys." into froyo
...
Merge commit 'f69fd4dd481c10749a8651ab6c9cfda1dea68297' into kraken
* commit 'f69fd4dd481c10749a8651ab6c9cfda1dea68297':
Doc change: Suggest min keysize of 2048 for keys.
2010-05-26 18:35:22 -07:00
Dirk Dougherty
58fccc44cd
am 4273ce19: Merge "Doc change: Suggest min keysize of 2048 for keys." into froyo
...
Merge commit '4273ce19bf898ee41f2342209af6fe8ef4fb128e' into froyo-plus-aosp
* commit '4273ce19bf898ee41f2342209af6fe8ef4fb128e':
Doc change: Suggest min keysize of 2048 for keys.
2010-05-26 18:33:05 -07:00
Dirk Dougherty
6667c7976f
Merge "Doc change: Suggest min keysize of 2048 for keys." into froyo
2010-05-26 18:31:38 -07:00
James Dong
d909ce2b1b
am 1090a29d: Merge "Avoid repeatedly allocating and freeing memory in CameraSource" into kraken
2010-05-26 17:02:45 -07:00
James Dong
dc976c589b
Merge "Avoid repeatedly allocating and freeing memory in CameraSource" into kraken
2010-05-26 17:01:16 -07:00
Dirk Dougherty
4d912627a6
am b8ab347b: am 81800015: am fa499e46: Merge "Doc change: fix adt download page, misc doc fixes." into froyo
2010-05-26 16:54:46 -07:00
Dirk Dougherty
414a687dfa
am 81800015: am fa499e46: Merge "Doc change: fix adt download page, misc doc fixes." into froyo
...
Merge commit '81800015afe3ee397bc6b07e37fd6dc57e3a3b9b' into kraken
* commit '81800015afe3ee397bc6b07e37fd6dc57e3a3b9b':
Doc change: fix adt download page, misc doc fixes.
2010-05-26 16:53:04 -07:00
Dirk Dougherty
e69271769a
am fa499e46: Merge "Doc change: fix adt download page, misc doc fixes." into froyo
...
Merge commit 'fa499e46203dba2db2bb40f71e5af1650315c67c' into froyo-plus-aosp
* commit 'fa499e46203dba2db2bb40f71e5af1650315c67c':
Doc change: fix adt download page, misc doc fixes.
2010-05-26 16:51:12 -07:00
Dirk Dougherty
60f35bb2fe
Merge "Doc change: fix adt download page, misc doc fixes." into froyo
2010-05-26 16:49:46 -07:00
Andreas Huber
c96c34f43f
am a08d8523: Merge "Convert a number of assertions into runtime errors (OggExtractor)" into kraken
2010-05-26 13:12:30 -07:00
Andreas Huber
3c0ade2393
Merge "Convert a number of assertions into runtime errors (OggExtractor)" into kraken
2010-05-26 13:10:47 -07:00
Irfan Sheriff
763a071f09
am 38417782: am c8390047: am 9ecca85f: Merge "Fix escaping of characters" into froyo
2010-05-26 13:07:38 -07:00
Irfan Sheriff
07e4687407
am c8390047: am 9ecca85f: Merge "Fix escaping of characters" into froyo
...
Merge commit 'c8390047bd2344032aca915816a8b91590835105' into kraken
* commit 'c8390047bd2344032aca915816a8b91590835105':
Fix escaping of characters
2010-05-26 13:05:53 -07:00
Irfan Sheriff
df360ef5dd
am 9ecca85f: Merge "Fix escaping of characters" into froyo
...
Merge commit '9ecca85f0613032590c6840cae48b54f3d626181' into froyo-plus-aosp
* commit '9ecca85f0613032590c6840cae48b54f3d626181':
Fix escaping of characters
2010-05-26 13:04:11 -07:00
Irfan Sheriff
d50f8399fa
Merge "Fix escaping of characters" into froyo
2010-05-26 13:02:06 -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
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
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
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
Andreas Huber
ded634d7a2
am c6c62e12: Support for ogg(vorbis) metadata in stagefright including album art.
2010-05-25 11:33:39 -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
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
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
8c59b89447
am 9a559970: am f67c874c: am 7e5e3745: Fix bug 2710825 - Prevent ExpandableListView from scrolling too far when expanding children.
2010-05-24 16:28:20 -07:00
Adam Powell
440bc27c3d
am f67c874c: am 7e5e3745: Fix bug 2710825 - Prevent ExpandableListView from scrolling too far when expanding children.
...
Merge commit 'f67c874c07d2e0ff888cc88679f884a833f89870' into kraken
* commit 'f67c874c07d2e0ff888cc88679f884a833f89870':
Fix bug 2710825 - Prevent ExpandableListView from scrolling too far when expanding children.
2010-05-24 16:26:06 -07:00
Adam Powell
213f391635
am 7e5e3745: Fix bug 2710825 - Prevent ExpandableListView from scrolling too far when expanding children.
...
Merge commit '7e5e3745cf0103219a13071fbd488c3c01da85d9' into froyo-plus-aosp
* commit '7e5e3745cf0103219a13071fbd488c3c01da85d9':
Fix bug 2710825 - Prevent ExpandableListView from scrolling too far when expanding children.
2010-05-24 16:23:53 -07:00
Mathias Agopian
a0b3f1d2eb
fix a bug when reallocating a window's buffers is needed
...
we need to mark the buffers that need to be reallocated,
NOT the buffer's indices.
Change-Id: I809e2e1b03b56c4d2ab983c25523dae99aa1da74
2010-05-24 13:47:24 -07:00
Mark Vandevoorde
8a7186bee4
am 88437284: Fix build error (Boolean -> boolean)
2010-05-24 13:45:42 -07:00