Irfan Sheriff
cde682745c
Merge "Fix null pointer exception" into froyo
2010-05-26 21:32:29 -07:00
Mathias Agopian
38ece279ea
oopsie. forgot to displatch SET_BUFFERS_GEOMETRY
2010-05-26 21:31:09 -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
dc976c589b
Merge "Avoid repeatedly allocating and freeing memory in CameraSource" into kraken
2010-05-26 17:01:16 -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
3c0ade2393
Merge "Convert a number of assertions into runtime errors (OggExtractor)" into kraken
2010-05-26 13:10:47 -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
caf11a838d
Merge "Squashed commit of the following:" into kraken
2010-05-26 11:21:06 -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
The Android Automerger
f6b1a13166
Merge branch 'froyo' into froyo-release
2010-05-25 21:23:30 -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
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
6bd416f0bf
Merge "Fix 2667859: change text back to default size" into kraken
2010-05-25 17:13:18 -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
60eef82e4d
Merge "Support for thumbnail extraction in the Matroska extractor." into kraken
2010-05-25 14:16:23 -07:00
Eric Laurent
dee5c2a3dc
Merge "Fix the simulator build broken by commit 5fe37c6838de9fbd959ad19ba44aa3d00d1b4e6f" into kraken
2010-05-25 12:42:53 -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
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
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
Mike Lockwood
5ed37d3343
Merge "Add Geocorder.isImplemented()" into kraken
2010-05-24 12:59:27 -07:00
James Dong
2673ba5825
Merge "Properly handle start code in H264/AVC encoder output" into kraken
2010-05-24 10:54:25 -07:00
Dirk Dougherty
1025833d0e
am 3cffe1ab: am c7c7afd7: Doc change: Fix incorrect adt version reference etc.
...
Merge commit '3cffe1ababdb09f4a90274e25c2f66feee299835' into kraken
* commit '3cffe1ababdb09f4a90274e25c2f66feee299835':
Doc change: Fix incorrect adt version reference etc.
2010-05-24 10:01:49 -07:00
Dirk Dougherty
534663ed7b
am c7c7afd7: Doc change: Fix incorrect adt version reference etc.
...
Merge commit 'c7c7afd7a1af36e787266815487f4600196406b8' into froyo-plus-aosp
* commit 'c7c7afd7a1af36e787266815487f4600196406b8':
Doc change: Fix incorrect adt version reference etc.
2010-05-24 09:56:47 -07:00
Daniel Sandler
b5f078204e
Merge "New shadowy status bar, direct from Z'ha'dum." into kraken
2010-05-24 05:45:56 -07:00
Chih-Chung Chang
6697ed5d4e
Merge "Disable CameraServiceTest in a normal build." into kraken
2010-05-23 21:04:01 -07:00
Mathias Agopian
f10d7fde03
added native_window_set_buffer_count()
...
this method can be used to change the number of buffers
associated to a native window. the default is two.
Change-Id: I608b959e6b29d77f95edb23c31dc9b099a758f2f
2010-05-21 14:34:32 -07:00
Mathias Agopian
3e23593d2f
Merge "fix the threading issue for setBuffercount()" into kraken
2010-05-21 13:53:28 -07:00
Mike Lockwood
1bb6a71178
Merge "Fix broken Javadoc links" into kraken
2010-05-21 12:28:11 -07:00
Mike Lockwood
c32b48e2b6
Merge "Report number of satellites used in fix instead of total for GPS Location extra" into kraken
2010-05-21 12:16:19 -07:00
Mike Lockwood
22b9e3ef1d
Merge "Unhide new location manager APIs:" into kraken
2010-05-21 11:16:51 -07:00
Mike Lockwood
9f715b544a
Merge "New Location Manager APIs for Criteria based requests and single shot mode." into kraken
2010-05-21 10:37:42 -07:00
Andreas Huber
1a4f294419
Merge "Support for media extraction from .mkv/.mka Matroska files in stagefright." into kraken
2010-05-21 08:09:53 -07:00
Mathias Agopian
bb641244d7
fix the threading issue for setBuffercount()
...
this change introduces R/W locks in the right places.
on the server-side, it guarantees that setBufferCount()
is synchronized with "retire" and "resize".
on the client-side, it guarantees that setBufferCount()
is synchronized with "dequeue", "lockbuffer" and "queue"
2010-05-20 18:00:42 -07:00
Andreas Huber
e2ee1feb70
Merge "Update software AVC decoder to no longer require the kWantsNALFragments hack." into kraken
2010-05-20 15:01:07 -07:00
The Android Automerger
d94880ca43
Merge branch 'froyo' into froyo-release
2010-05-20 12:28:06 -07:00
James Dong
24d7f03d33
Merge "Workaround for preview frame rate setting and encoder profile and level settings on passion 1. QCOM camera HAL does not honor the preview frame rate set request. see bug - 2701282 2. QCOM video encoder has lots of 0-length output buffers if the default level setting is changed. see bug - 2660974" into kraken
2010-05-20 12:18:39 -07:00