James Dong
8ee529f0e4
am 46441198: Merge "Avoid copying for input recording frames in CameraSource" into kraken
2010-05-28 11:01:48 -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
507cbb5012
am 198975bb: Merge "Add video frame parameter." into kraken
2010-05-28 04:36:29 -07:00
Wu-cheng Li
9bce74f474
Merge "Add video frame parameter." into kraken
2010-05-28 04:34:13 -07:00
Mathias Agopian
9d17592c99
am 64ff6ab4: Merge "more clean-up of Surfaceflinger\'s client management" into kraken
2010-05-27 20:05:20 -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
329ffd7613
am ddbab4e1: am 6cc13745: am 94f1751c: Merge "Fix typo in EastAsianWidth javadoc" into froyo
2010-05-27 12:39:20 -07:00
Dirk Dougherty
0956bb73f4
am 75ef3197: am 9eae9572: am 9f95c64e: Merge "Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables." into froyo
2010-05-27 12:39:16 -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
d2077237c1
am 1a35e612: Merge "Better sniffing of MPEG4 content by checking for a compatible sub-brand." into kraken
2010-05-27 10:18:32 -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
652a300ae3
am c0046aab: am edf228ce: am dc46f6f6: Merge "Don\'t enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts." into froyo
2010-05-27 09:43: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
12a99afda4
am 2cb138db: Merge "After failing to create an AudioTrack, only stop the source if we were the ones starting it." into kraken
2010-05-27 08:59:07 -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
James Dong
7635a5c07c
am 407f98bf: Remove the logic in CameraSource using CameraParameters class to find out the buffer size.
2010-05-27 08:00:31 -07:00
Wu-cheng Li
c1536b7de9
am c109190b: Add support for gps altitude EXIF tags.
2010-05-27 01:03:10 -07:00
Mathias Agopian
2d42fcacd9
am df0364de: Merge "minor clean-up GLclampx -> GLclampf" into kraken
2010-05-26 22:50:00 -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
282d188d21
am d908822d: Merge "clean-up dead-code" into kraken
2010-05-26 22:21:47 -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
30643d5fbb
am a950aa84: Merge "Make sure to use filtering while in fixed-size mode" into kraken
2010-05-26 22:12:55 -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
8c13514b44
am 2ed40379: am 8316e875: am b3f3caef: Merge "Fix null pointer exception" into froyo
2010-05-26 21:39:39 -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
Mathias Agopian
ce5d8bb772
am 7ca7eedb: Merge "oopsie. forgot to displatch SET_BUFFERS_GEOMETRY" into kraken
2010-05-26 21:36:47 -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
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