Mathias Agopian
49753266d2
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.
2010-06-01 15:57:44 -07:00
Dirk Dougherty
f1ad0d9c74
am 8799cdfb: am de56c27d: Merge "Doc change: rename slide decks for sorting by year then quarter." into froyo
...
Merge commit '8799cdfb012935501e47f15f28d6a8ed90bd464d' into kraken
* commit '8799cdfb012935501e47f15f28d6a8ed90bd464d':
Doc change: rename slide decks for sorting by year then quarter.
2010-06-01 15:46:53 -07:00
Dirk Dougherty
7c7eadeb4f
am de56c27d: Merge "Doc change: rename slide decks for sorting by year then quarter." into froyo
...
Merge commit 'de56c27dab020bf85187c8bcfc6842cb31006c59' into froyo-plus-aosp
* commit 'de56c27dab020bf85187c8bcfc6842cb31006c59':
Doc change: rename slide decks for sorting by year then quarter.
2010-06-01 15:45:24 -07:00
Dirk Dougherty
4005afd071
Merge "Doc change: rename slide decks for sorting by year then quarter." into froyo
2010-06-01 15:44:02 -07:00
Dan Egnor
5220f48338
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
2010-06-01 14:44:35 -07:00
Dan Egnor
d691a841f6
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
2010-06-01 14:28:46 -07:00
Dan Egnor
f192ba713b
Merge "Comment-only change to add documentation for FileObserver" into froyo
2010-06-01 14:09:20 -07:00
Dirk Dougherty
9ec89bbbf8
am bce5edaf: am 862ad0e5: Merge "Doc change: updated dashboards stats." into froyo
...
Merge commit 'bce5edaf46e2abbfb07f3a292b1b967fab7d9ffe' into kraken
* commit 'bce5edaf46e2abbfb07f3a292b1b967fab7d9ffe':
Doc change: updated dashboards stats.
2010-06-01 11:13:29 -07:00
Dirk Dougherty
88e4f7fb39
am 862ad0e5: Merge "Doc change: updated dashboards stats." into froyo
...
Merge commit '862ad0e5242ae6ec43e8570c52e81b0953e6e76c' into froyo-plus-aosp
* commit '862ad0e5242ae6ec43e8570c52e81b0953e6e76c':
Doc change: updated dashboards stats.
2010-06-01 11:07:56 -07:00
Dirk Dougherty
2a053dc08d
Merge "Doc change: updated dashboards stats." into froyo
2010-06-01 11:04:20 -07:00
Mathias Agopian
7e27f05739
more clean-up in preparation of bigger changes
...
the most important change here is the renaming of
ISurfaceFlingerClient to ISurfaceComposerClient
Change-Id: I94e18b0417f50e06f21377446639c61f65f959b3
2010-05-28 17:19:16 -07:00
Mathias Agopian
b8510b98b5
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.
2010-05-28 15:13:30 -07:00
Christopher Tate
26acf3fa06
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
2010-05-28 12:52:43 -07:00
Christopher Tate
1647a676f3
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
2010-05-28 12:50:05 -07:00
James Dong
337eee57ba
Merge "Avoid copying for input recording frames in CameraSource" into kraken
2010-05-28 10:53:09 -07:00
Wu-cheng Li
9bce74f474
Merge "Add video frame parameter." into kraken
2010-05-28 04:34:13 -07:00
Mathias Agopian
0208f2960c
Merge "more clean-up of Surfaceflinger's client management" into kraken
2010-05-27 20:04:05 -07:00
Mathias Agopian
d4784a3b90
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
2010-05-27 19:55:43 -07:00
Kenny Root
6ea5538527
am 6cc13745: am 94f1751c: Merge "Fix typo in EastAsianWidth javadoc" into froyo
...
Merge commit '6cc137459a21e67765d2490529a920ccfb14e362' into kraken
* commit '6cc137459a21e67765d2490529a920ccfb14e362':
Fix typo in EastAsianWidth javadoc
2010-05-27 12:37:28 -07:00
Dirk Dougherty
a76c33a393
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.
2010-05-27 12:37:22 -07:00
Kenny Root
085a308606
am 94f1751c: Merge "Fix typo in EastAsianWidth javadoc" into froyo
...
Merge commit '94f1751cb0c6ea4004ff86b3af89e06e00a66641' into froyo-plus-aosp
* commit '94f1751cb0c6ea4004ff86b3af89e06e00a66641':
Fix typo in EastAsianWidth javadoc
2010-05-27 12:35:25 -07:00
Dirk Dougherty
2c03020da7
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.
2010-05-27 12:35:18 -07:00
Kenny Root
2baa0fbad3
Merge "Fix typo in EastAsianWidth javadoc" into froyo
2010-05-27 12:04:34 -07:00
Dirk Dougherty
f007f06d61
Merge "Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables." into froyo
2010-05-27 11:46:26 -07:00
Andreas Huber
7153f04882
Merge "Better sniffing of MPEG4 content by checking for a compatible sub-brand." into kraken
2010-05-27 10:16:54 -07:00
Jeff Hamilton
3c27fda678
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.
2010-05-27 09:42:44 -07:00
Jeff Hamilton
9994e682f1
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.
2010-05-27 09:40:23 -07:00
Jeff Hamilton
5b4069e958
Merge "Don't enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts." into froyo
2010-05-27 09:39:19 -07:00
Andreas Huber
f323def17b
Merge "After failing to create an AudioTrack, only stop the source if we were the ones starting it." into kraken
2010-05-27 08:57:23 -07:00
Mathias Agopian
9aaa3661ee
Merge "minor clean-up GLclampx -> GLclampf" into kraken
2010-05-26 22:49:03 -07:00
Mathias Agopian
010fccb063
minor clean-up GLclampx -> GLclampf
2010-05-26 22:26:12 -07:00
Mathias Agopian
a051357406
Merge "clean-up dead-code" into kraken
2010-05-26 22:20:39 -07:00
Mathias Agopian
dc7a80f07a
clean-up dead-code
2010-05-26 22:19:19 -07:00
Mathias Agopian
eaa60d313a
Merge "Make sure to use filtering while in fixed-size mode" into kraken
2010-05-26 22:11:03 -07:00
Mathias Agopian
a7f669256f
Make sure to use filtering while in fixed-size mode
2010-05-26 22:10:04 -07:00
Irfan Sheriff
5260f23bf1
am 8316e875: am b3f3caef: Merge "Fix null pointer exception" into froyo
...
Merge commit '8316e875baee53b661d5af8fa843d97e51acbcf6' into kraken
* commit '8316e875baee53b661d5af8fa843d97e51acbcf6':
Fix null pointer exception
2010-05-26 21:37:45 -07:00
Irfan Sheriff
4a977bd462
am b3f3caef: Merge "Fix null pointer exception" into froyo
...
Merge commit 'b3f3caef38326be2b4aea309237f718e6e2d2b8a' into froyo-plus-aosp
* commit 'b3f3caef38326be2b4aea309237f718e6e2d2b8a':
Fix null pointer exception
2010-05-26 21:34:52 -07:00
Mathias Agopian
1afa755ca8
Merge "oopsie. forgot to displatch SET_BUFFERS_GEOMETRY" into kraken
2010-05-26 21:34:52 -07:00
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