OSDN Git Service
Mathias Agopian [Mon, 12 Apr 2010 22:34:55 +0000 (15:34 -0700)]
fix a bug where fading in/out of opaque 32-bits windows wasn't working
opaque 32-bits windows are now allocated as RGBX_8888 buffers and
SurfaceFlinger always uses GL_MODULATE instead of trying to
optimize to GL_REPLACE when possible (makes no sense on
h/w accelerated GL).
we still have a small hack for devices that don't support
RGBX_8888 in their gralloc implementation where we revert to
RGBA_8888.
Dan Egnor [Tue, 1 Jun 2010 21:44:35 +0000 (14:44 -0700)]
am
1f5e8473: am
a80331c4: Merge "Comment-only change to add documentation for FileObserver" into froyo
Merge commit '
1f5e847350ef1aece046666e20e7692a1651d9dc' into kraken
* commit '
1f5e847350ef1aece046666e20e7692a1651d9dc':
Comment-only change to add documentation for FileObserver
Dan Egnor [Tue, 1 Jun 2010 21:28:46 +0000 (14:28 -0700)]
am
a80331c4: Merge "Comment-only change to add documentation for FileObserver" into froyo
Merge commit '
a80331c4d75cb8a7122e31315bc1e2950131659c' into froyo-plus-aosp
* commit '
a80331c4d75cb8a7122e31315bc1e2950131659c':
Comment-only change to add documentation for FileObserver
Dan Egnor [Tue, 1 Jun 2010 21:09:20 +0000 (14:09 -0700)]
Merge "Comment-only change to add documentation for FileObserver" into froyo
Dirk Dougherty [Tue, 1 Jun 2010 18:13:29 +0000 (11:13 -0700)]
am
bce5edaf: am
862ad0e5: Merge "Doc change: updated dashboards stats." into froyo
Merge commit '
bce5edaf46e2abbfb07f3a292b1b967fab7d9ffe' into kraken
* commit '
bce5edaf46e2abbfb07f3a292b1b967fab7d9ffe':
Doc change: updated dashboards stats.
Dirk Dougherty [Tue, 1 Jun 2010 18:07:56 +0000 (11:07 -0700)]
am
862ad0e5: Merge "Doc change: updated dashboards stats." into froyo
Merge commit '
862ad0e5242ae6ec43e8570c52e81b0953e6e76c' into froyo-plus-aosp
* commit '
862ad0e5242ae6ec43e8570c52e81b0953e6e76c':
Doc change: updated dashboards stats.
Dirk Dougherty [Tue, 1 Jun 2010 18:04:20 +0000 (11:04 -0700)]
Merge "Doc change: updated dashboards stats." into froyo
Mathias Agopian [Fri, 28 May 2010 21:22:23 +0000 (14:22 -0700)]
more clean-up in preparation of bigger changes
the most important change here is the renaming of
ISurfaceFlingerClient to ISurfaceComposerClient
Change-Id: I94e18b0417f50e06f21377446639c61f65f959b3
Mathias Agopian [Fri, 28 May 2010 22:13:30 +0000 (15:13 -0700)]
Fix a typo in Singleton<>
it could cause the sLock field to be emitted several times
in different compilation unit. it also prevented to
have 2 Singleton<> in the same file.
Christopher Tate [Fri, 28 May 2010 19:52:43 +0000 (12:52 -0700)]
am
5c9d9949: am
6ee412d5: Also dump system process threads halfway through the watchdog interval
Merge commit '
5c9d99496dab7a5cfe7cd37df749075ec9b4421b' into kraken
* commit '
5c9d99496dab7a5cfe7cd37df749075ec9b4421b':
Also dump system process threads halfway through the watchdog interval
Christopher Tate [Fri, 28 May 2010 19:50:05 +0000 (12:50 -0700)]
am
6ee412d5: Also dump system process threads halfway through the watchdog interval
Merge commit '
6ee412d51d8b601580cfb4b7be4f676b7ec76afd' into froyo-plus-aosp
* commit '
6ee412d51d8b601580cfb4b7be4f676b7ec76afd':
Also dump system process threads halfway through the watchdog interval
James Dong [Fri, 28 May 2010 17:53:09 +0000 (10:53 -0700)]
Merge "Avoid copying for input recording frames in CameraSource" into kraken
Wu-cheng Li [Fri, 28 May 2010 11:34:13 +0000 (04:34 -0700)]
Merge "Add video frame parameter." into kraken
Mathias Agopian [Fri, 28 May 2010 03:04:05 +0000 (20:04 -0700)]
Merge "more clean-up of Surfaceflinger's client management" into kraken
Mathias Agopian [Fri, 28 May 2010 02:41:15 +0000 (19:41 -0700)]
more clean-up of Surfaceflinger's client management
SurfaceComposerClient now only exist on the WindowManager side,
the client side uses the new SurfaceClient class, which only
exposes what a client needs.
also instead of keeping mappings from IBinder to SurfaceComposerClients
we have a SurfaceClient per Surface (referring to the same IBinder), this
is made possible by the fact that SurfaceClient is very light.
Change-Id: I6a1f7015424f07871632a25ed6a502c55abfcfa6
Kenny Root [Thu, 27 May 2010 19:37:28 +0000 (12:37 -0700)]
am
6cc13745: am
94f1751c: Merge "Fix typo in EastAsianWidth javadoc" into froyo
Merge commit '
6cc137459a21e67765d2490529a920ccfb14e362' into kraken
* commit '
6cc137459a21e67765d2490529a920ccfb14e362':
Fix typo in EastAsianWidth javadoc
Dirk Dougherty [Thu, 27 May 2010 19:37:22 +0000 (12:37 -0700)]
am
9eae9572: am
9f95c64e: Merge "Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables." into froyo
Merge commit '
9eae957207c016db032819eadef261addf994a0d' into kraken
* commit '
9eae957207c016db032819eadef261addf994a0d':
Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables.
Kenny Root [Thu, 27 May 2010 19:35:25 +0000 (12:35 -0700)]
am
94f1751c: Merge "Fix typo in EastAsianWidth javadoc" into froyo
Merge commit '
94f1751cb0c6ea4004ff86b3af89e06e00a66641' into froyo-plus-aosp
* commit '
94f1751cb0c6ea4004ff86b3af89e06e00a66641':
Fix typo in EastAsianWidth javadoc
Dirk Dougherty [Thu, 27 May 2010 19:35:18 +0000 (12:35 -0700)]
am
9f95c64e: Merge "Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables." into froyo
Merge commit '
9f95c64e66df7481b1c624c6cf29569ca384a822' into froyo-plus-aosp
* commit '
9f95c64e66df7481b1c624c6cf29569ca384a822':
Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables.
Kenny Root [Thu, 27 May 2010 19:04:34 +0000 (12:04 -0700)]
Merge "Fix typo in EastAsianWidth javadoc" into froyo
Dirk Dougherty [Thu, 27 May 2010 18:46:26 +0000 (11:46 -0700)]
Merge "Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables." into froyo
Andreas Huber [Thu, 27 May 2010 17:16:54 +0000 (10:16 -0700)]
Merge "Better sniffing of MPEG4 content by checking for a compatible sub-brand." into kraken
Jeff Hamilton [Thu, 27 May 2010 16:42:44 +0000 (09:42 -0700)]
am
edf228ce: am
dc46f6f6: Merge "Don\'t enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts." into froyo
Merge commit '
edf228ce1fc9aae9fe314229c19e80a434bb4393' into kraken
* commit '
edf228ce1fc9aae9fe314229c19e80a434bb4393':
Don't enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts.
Jeff Hamilton [Thu, 27 May 2010 16:40:23 +0000 (09:40 -0700)]
am
dc46f6f6: Merge "Don\'t enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts." into froyo
Merge commit '
dc46f6f6cc44954c23229019270b54b8912be825' into froyo-plus-aosp
* commit '
dc46f6f6cc44954c23229019270b54b8912be825':
Don't enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts.
Jeff Hamilton [Thu, 27 May 2010 16:39:19 +0000 (09:39 -0700)]
Merge "Don't enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts." into froyo
Andreas Huber [Thu, 27 May 2010 15:57:23 +0000 (08:57 -0700)]
Merge "After failing to create an AudioTrack, only stop the source if we were the ones starting it." into kraken
Mathias Agopian [Thu, 27 May 2010 05:49:03 +0000 (22:49 -0700)]
Merge "minor clean-up GLclampx -> GLclampf" into kraken
Mathias Agopian [Thu, 27 May 2010 05:26:12 +0000 (22:26 -0700)]
minor clean-up GLclampx -> GLclampf
Mathias Agopian [Thu, 27 May 2010 05:20:39 +0000 (22:20 -0700)]
Merge "clean-up dead-code" into kraken
Mathias Agopian [Thu, 27 May 2010 05:19:19 +0000 (22:19 -0700)]
clean-up dead-code
Mathias Agopian [Thu, 27 May 2010 05:11:03 +0000 (22:11 -0700)]
Merge "Make sure to use filtering while in fixed-size mode" into kraken
Mathias Agopian [Thu, 27 May 2010 05:08:52 +0000 (22:08 -0700)]
Make sure to use filtering while in fixed-size mode
Irfan Sheriff [Thu, 27 May 2010 04:37:45 +0000 (21:37 -0700)]
am
8316e875: am
b3f3caef: Merge "Fix null pointer exception" into froyo
Merge commit '
8316e875baee53b661d5af8fa843d97e51acbcf6' into kraken
* commit '
8316e875baee53b661d5af8fa843d97e51acbcf6':
Fix null pointer exception
Irfan Sheriff [Thu, 27 May 2010 04:34:52 +0000 (21:34 -0700)]
am
b3f3caef: Merge "Fix null pointer exception" into froyo
Merge commit '
b3f3caef38326be2b4aea309237f718e6e2d2b8a' into froyo-plus-aosp
* commit '
b3f3caef38326be2b4aea309237f718e6e2d2b8a':
Fix null pointer exception
Mathias Agopian [Thu, 27 May 2010 04:34:52 +0000 (21:34 -0700)]
Merge "oopsie. forgot to displatch SET_BUFFERS_GEOMETRY" into kraken
Irfan Sheriff [Thu, 27 May 2010 04:32:29 +0000 (21:32 -0700)]
Merge "Fix null pointer exception" into froyo
Mathias Agopian [Thu, 27 May 2010 04:31:09 +0000 (21:31 -0700)]
oopsie. forgot to displatch SET_BUFFERS_GEOMETRY
Dirk Dougherty [Thu, 27 May 2010 01:35:22 +0000 (18:35 -0700)]
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.
Dirk Dougherty [Thu, 27 May 2010 01:33:05 +0000 (18:33 -0700)]
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.
Dirk Dougherty [Thu, 27 May 2010 01:31:38 +0000 (18:31 -0700)]
Merge "Doc change: Suggest min keysize of 2048 for keys." into froyo
James Dong [Thu, 27 May 2010 00:01:16 +0000 (17:01 -0700)]
Merge "Avoid repeatedly allocating and freeing memory in CameraSource" into kraken
Dirk Dougherty [Wed, 26 May 2010 23:53:04 +0000 (16:53 -0700)]
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.
Dirk Dougherty [Wed, 26 May 2010 23:51:12 +0000 (16:51 -0700)]
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.
Dirk Dougherty [Wed, 26 May 2010 23:49:46 +0000 (16:49 -0700)]
Merge "Doc change: fix adt download page, misc doc fixes." into froyo
Andreas Huber [Wed, 26 May 2010 20:10:47 +0000 (13:10 -0700)]
Merge "Convert a number of assertions into runtime errors (OggExtractor)" into kraken
Irfan Sheriff [Wed, 26 May 2010 20:05:53 +0000 (13:05 -0700)]
am
c8390047: am
9ecca85f: Merge "Fix escaping of characters" into froyo
Merge commit '
c8390047bd2344032aca915816a8b91590835105' into kraken
* commit '
c8390047bd2344032aca915816a8b91590835105':
Fix escaping of characters
Irfan Sheriff [Wed, 26 May 2010 20:04:11 +0000 (13:04 -0700)]
am
9ecca85f: Merge "Fix escaping of characters" into froyo
Merge commit '
9ecca85f0613032590c6840cae48b54f3d626181' into froyo-plus-aosp
* commit '
9ecca85f0613032590c6840cae48b54f3d626181':
Fix escaping of characters
Irfan Sheriff [Wed, 26 May 2010 20:02:06 +0000 (13:02 -0700)]
Merge "Fix escaping of characters" into froyo
Andreas Huber [Wed, 26 May 2010 18:21:06 +0000 (11:21 -0700)]
Merge "Squashed commit of the following:" into kraken
Eric Laurent [Wed, 26 May 2010 06:48:30 +0000 (23:48 -0700)]
Merge "Fix issue
2667797: [Audio Effect Framework] new base class and binder interfaces for effect control." into kraken
Mathias Agopian [Wed, 26 May 2010 00:56:07 +0000 (17:56 -0700)]
Merge "fix [
2712278] The preview buffer left some black borders in left and bottom edges" into kraken
Mathias Agopian [Wed, 26 May 2010 00:51:34 +0000 (17:51 -0700)]
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
Yu Shan Emily Lau [Wed, 26 May 2010 00:44:46 +0000 (17:44 -0700)]
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.
Yu Shan Emily Lau [Wed, 26 May 2010 00:42:29 +0000 (17:42 -0700)]
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.
Yu Shan Emily Lau [Wed, 26 May 2010 00:40:51 +0000 (17:40 -0700)]
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
Jim Miller [Wed, 26 May 2010 00:13:18 +0000 (17:13 -0700)]
Merge "Fix
2667859: change text back to default size" into kraken
Robert Greenwalt [Tue, 25 May 2010 23:15:37 +0000 (16:15 -0700)]
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
Robert Greenwalt [Tue, 25 May 2010 23:13:22 +0000 (16:13 -0700)]
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
Andreas Huber [Tue, 25 May 2010 21:16:18 +0000 (14:16 -0700)]
Merge "Support for thumbnail extraction in the Matroska extractor." into kraken
Eric Laurent [Tue, 25 May 2010 19:42:53 +0000 (12:42 -0700)]
Merge "Fix the simulator build broken by commit
5fe37c6838de9fbd959ad19ba44aa3d00d1b4e6f" into kraken
Eric Laurent [Tue, 25 May 2010 06:23:29 +0000 (23:23 -0700)]
Merge "Fix issue
2667796: [Audio Effect Framework] Effect factory and libraries." into kraken
Mathias Agopian [Tue, 25 May 2010 01:30:35 +0000 (18:30 -0700)]
Merge "added the notion of fixed-size buffers" into kraken
Mathias Agopian [Tue, 25 May 2010 01:30:25 +0000 (18:30 -0700)]
Merge "fix a bug when reallocating a window's buffers is needed" into kraken
Mathias Agopian [Sat, 22 May 2010 00:24:35 +0000 (17:24 -0700)]
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
Adam Powell [Mon, 24 May 2010 23:26:06 +0000 (16:26 -0700)]
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.
Adam Powell [Mon, 24 May 2010 23:23:53 +0000 (16:23 -0700)]
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.
Mathias Agopian [Fri, 21 May 2010 21:51:33 +0000 (14:51 -0700)]
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
Mike Lockwood [Mon, 24 May 2010 19:59:27 +0000 (12:59 -0700)]
Merge "Add Geocorder.isImplemented()" into kraken
James Dong [Mon, 24 May 2010 17:54:25 +0000 (10:54 -0700)]
Merge "Properly handle start code in H264/AVC encoder output" into kraken
Dirk Dougherty [Mon, 24 May 2010 17:01:49 +0000 (10:01 -0700)]
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.
Dirk Dougherty [Mon, 24 May 2010 16:56:47 +0000 (09:56 -0700)]
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.
Daniel Sandler [Mon, 24 May 2010 12:45:56 +0000 (05:45 -0700)]
Merge "New shadowy status bar, direct from Z'ha'dum." into kraken
Chih-Chung Chang [Mon, 24 May 2010 04:04:01 +0000 (21:04 -0700)]
Merge "Disable CameraServiceTest in a normal build." into kraken
Mathias Agopian [Fri, 21 May 2010 21:19:50 +0000 (14:19 -0700)]
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
Mathias Agopian [Fri, 21 May 2010 20:53:28 +0000 (13:53 -0700)]
Merge "fix the threading issue for setBuffercount()" into kraken
Mike Lockwood [Fri, 21 May 2010 19:28:11 +0000 (12:28 -0700)]
Merge "Fix broken Javadoc links" into kraken
Mike Lockwood [Fri, 21 May 2010 19:16:19 +0000 (12:16 -0700)]
Merge "Report number of satellites used in fix instead of total for GPS Location extra" into kraken
Mike Lockwood [Fri, 21 May 2010 18:16:51 +0000 (11:16 -0700)]
Merge "Unhide new location manager APIs:" into kraken
Mike Lockwood [Fri, 21 May 2010 17:37:42 +0000 (10:37 -0700)]
Merge "New Location Manager APIs for Criteria based requests and single shot mode." into kraken
Andreas Huber [Fri, 21 May 2010 15:09:53 +0000 (08:09 -0700)]
Merge "Support for media extraction from .mkv/.mka Matroska files in stagefright." into kraken
Mathias Agopian [Wed, 19 May 2010 00:06:55 +0000 (17:06 -0700)]
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"
Andreas Huber [Thu, 20 May 2010 22:01:07 +0000 (15:01 -0700)]
Merge "Update software AVC decoder to no longer require the kWantsNALFragments hack." into kraken
James Dong [Thu, 20 May 2010 19:18:39 +0000 (12:18 -0700)]
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
Andreas Huber [Thu, 20 May 2010 18:14:37 +0000 (11:14 -0700)]
am
3c16154a: am
2723e092: Merge "Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize." into froyo
Merge commit '
3c16154a3309fe250177d69f3fcd5b6e9a82d1b3' into kraken
* commit '
3c16154a3309fe250177d69f3fcd5b6e9a82d1b3':
Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize.
Andreas Huber [Thu, 20 May 2010 18:13:20 +0000 (11:13 -0700)]
am
2723e092: Merge "Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize." into froyo
Merge commit '
2723e09229ce916724861ab90b6b8fc7c9ea9f2e' into froyo-plus-aosp
* commit '
2723e09229ce916724861ab90b6b8fc7c9ea9f2e':
Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize.
Andreas Huber [Thu, 20 May 2010 18:11:39 +0000 (11:11 -0700)]
Merge "Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize." into froyo
Xia Wang [Thu, 20 May 2010 17:58:18 +0000 (10:58 -0700)]
am
3716ea04: am
06906796: If the network SSID is a string, it should be enclosed in double quotation marks.
Merge commit '
3716ea04d9fd59ff95bacdf6efac4ab5583e13fc' into kraken
* commit '
3716ea04d9fd59ff95bacdf6efac4ab5583e13fc':
If the network SSID is a string, it should be enclosed in double quotation marks.
Xia Wang [Thu, 20 May 2010 17:56:13 +0000 (10:56 -0700)]
am
06906796: If the network SSID is a string, it should be enclosed in double quotation marks.
Merge commit '
069067963cf0117cfb4a1aef99b550b126d9ca92' into froyo-plus-aosp
* commit '
069067963cf0117cfb4a1aef99b550b126d9ca92':
If the network SSID is a string, it should be enclosed in double quotation marks.
Wu-cheng Li [Thu, 20 May 2010 08:46:51 +0000 (01:46 -0700)]
Merge "Fix javadoc of camera focus distances API." into kraken
Dirk Dougherty [Thu, 20 May 2010 07:17:14 +0000 (00:17 -0700)]
am
41a254cf: am
dc737ca9: Doc change: Add new tv to carousel.
Merge commit '
41a254cf1b770dded24dcdb2dab6347da6dcf8bf' into kraken
* commit '
41a254cf1b770dded24dcdb2dab6347da6dcf8bf':
Doc change: Add new tv to carousel.
Dirk Dougherty [Thu, 20 May 2010 07:15:41 +0000 (00:15 -0700)]
am
dc737ca9: Doc change: Add new tv to carousel.
Merge commit '
dc737ca986ed9055b4bb39c67d470b6886522ca6' into froyo-plus-aosp
* commit '
dc737ca986ed9055b4bb39c67d470b6886522ca6':
Doc change: Add new tv to carousel.
Scott Main [Thu, 20 May 2010 03:27:21 +0000 (20:27 -0700)]
am
cf757914: am
55f383a9: Merge "docs: add youtube video to highlights" into froyo
Merge commit '
cf7579148a95b4875b1d5e7430fb8d6f362cefac' into kraken
* commit '
cf7579148a95b4875b1d5e7430fb8d6f362cefac':
docs: add youtube video to highlights
Scott Main [Thu, 20 May 2010 03:25:15 +0000 (20:25 -0700)]
am
55f383a9: Merge "docs: add youtube video to highlights" into froyo
Merge commit '
55f383a9b8da99aa48857fea27a35badc515d8bd' into froyo-plus-aosp
* commit '
55f383a9b8da99aa48857fea27a35badc515d8bd':
docs: add youtube video to highlights
Scott Main [Thu, 20 May 2010 03:24:18 +0000 (20:24 -0700)]
Merge "docs: add youtube video to highlights" into froyo
Scott Main [Thu, 20 May 2010 02:32:25 +0000 (19:32 -0700)]
am
864c3d1b: am
80259899: Merge "doc: add developing and testing info to backup guide" into froyo
Merge commit '
864c3d1b90ebcd3c7ae15fe57319aa19c2fe5926' into kraken
* commit '
864c3d1b90ebcd3c7ae15fe57319aa19c2fe5926':
doc: add developing and testing info to backup guide
Scott Main [Thu, 20 May 2010 02:30:29 +0000 (19:30 -0700)]
am
80259899: Merge "doc: add developing and testing info to backup guide" into froyo
Merge commit '
8025989957e5b6ad51e99a69a0e1e753e40cba67' into froyo-plus-aosp
* commit '
8025989957e5b6ad51e99a69a0e1e753e40cba67':
doc: add developing and testing info to backup guide
Scott Main [Thu, 20 May 2010 02:29:19 +0000 (19:29 -0700)]
Merge "doc: add developing and testing info to backup guide" into froyo
Dirk Dougherty [Thu, 20 May 2010 01:59:57 +0000 (18:59 -0700)]
am
1eb4a9d8: am
44108b54: Doc change: Move framework api change info higher in platform notes documents. Small adjustment to compatibility doc.
Merge commit '
1eb4a9d8e97252427b785525f17b370b1ea5fe07' into kraken
* commit '
1eb4a9d8e97252427b785525f17b370b1ea5fe07':
Doc change: Move framework api change info higher in platform notes documents.
Dirk Dougherty [Thu, 20 May 2010 01:58:03 +0000 (18:58 -0700)]
am
44108b54: Doc change: Move framework api change info higher in platform notes documents. Small adjustment to compatibility doc.
Merge commit '
44108b54543c87e2c46a6d5d4339b3c4e06373de' into froyo-plus-aosp
* commit '
44108b54543c87e2c46a6d5d4339b3c4e06373de':
Doc change: Move framework api change info higher in platform notes documents.
Scott Main [Thu, 20 May 2010 01:08:34 +0000 (18:08 -0700)]
am
fa6ee245: am
68728cb3: docs: add 2.2 platform highlights
Merge commit '
fa6ee245c7010101d87194b00f34ea3448053f28' into kraken
* commit '
fa6ee245c7010101d87194b00f34ea3448053f28':
docs: add 2.2 platform highlights
OSDN Git Service
