Commit Graph

17530 Commits

Author SHA1 Message Date
Eric Laurent
d4c8219354 am cdf1357b: am 8e103da1: Merge "Various fixes and improvements in audio effects implementation" into gingerbread
Merge commit 'cdf1357b6e0152280dcd611b5f096db4887d8126'

* commit 'cdf1357b6e0152280dcd611b5f096db4887d8126':
  Various fixes and improvements in audio effects implementation
2010-06-25 14:22:39 -07:00
Andreas Huber
7016679cc8 am 2f8f81f5: am 330dd304: Revert "fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger"
Merge commit '2f8f81f5c2e42f52b1a7796ef23b83172c6bc4d9'

* commit '2f8f81f5c2e42f52b1a7796ef23b83172c6bc4d9':
  Revert "fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger"
2010-06-25 14:22:35 -07:00
The Android Open Source Project
606f31da70 am 102d0ab0: merge from froyo-plus-aosp
Merge commit '102d0ab071af04c81ede8155205a6231b99b140c'

* commit '102d0ab071af04c81ede8155205a6231b99b140c':
2010-06-25 14:22:31 -07:00
The Android Open Source Project
b4d837432a am 8b0d5bc3: merge from froyo-plus-aosp
Merge commit '8b0d5bc3f858ae2b737ac654fa05c439344ad631'

* commit '8b0d5bc3f858ae2b737ac654fa05c439344ad631':
  Fixing counting the number of days in call log screen.
2010-06-25 14:22:25 -07:00
The Android Open Source Project
b0703da732 am d3844bcf: merge from froyo-plus-aosp
Merge commit 'd3844bcfb05719ab69d4aae6f4767ad3ef6d23fc'

* commit 'd3844bcfb05719ab69d4aae6f4767ad3ef6d23fc':
  Support custom themes with AlertDialog.Builder
2010-06-25 14:22:11 -07:00
The Android Open Source Project
27f5bc8ff5 am 7e343b8d: merge from froyo-plus-aosp
Merge commit '7e343b8d39309d2c9d73cc5d1ec2434e666ae48b'

* commit '7e343b8d39309d2c9d73cc5d1ec2434e666ae48b':
  fillWindow's start position must be smaller than getCount value
2010-06-25 14:22:06 -07:00
The Android Open Source Project
e2e4727ac5 am f29fbc58: merge from froyo-plus-aosp
Merge commit 'f29fbc58ec6a85115322100ed86c61679ac09c1c'

* commit 'f29fbc58ec6a85115322100ed86c61679ac09c1c':
  Change in media scanner to set correct date
2010-06-25 14:22:01 -07:00
Andreas Huber
0c29df4563 am 75fb44b2: am 357f8209: Merge "Finetune some of the prefetcher parameters to a) buffer as much as froyo did b) ensure that keepalives actually trigger a network read instead of just draining internal buffers" into gingerbread
Merge commit '75fb44b2344b900485aaf4506531010a8335b5a7'

* commit '75fb44b2344b900485aaf4506531010a8335b5a7':
  Finetune some of the prefetcher parameters to a) buffer as much as froyo did b) ensure that keepalives actually trigger a network read instead of just draining internal buffers
2010-06-25 14:21:55 -07:00
James Dong
0e554127b4 am bc704ddd: am 6feaa464: Enable passing parameters to the MediaWriter at runtime (at start() call).
Merge commit 'bc704dddb6d1239c55f6cd0f93d349f7cc3d1219'

* commit 'bc704dddb6d1239c55f6cd0f93d349f7cc3d1219':
  Enable passing parameters to the MediaWriter at runtime (at start() call).
2010-06-25 14:21:50 -07:00
The Android Open Source Project
c220c3051e am 3b335078: ignore from froyo-plus-aosp
Merge commit '3b335078e8a6fe3e2045ad081785f139d5991786'

* commit '3b335078e8a6fe3e2045ad081785f139d5991786':
  Fix that InputDeviceReaderThread that got killed during startup
2010-06-25 14:21:44 -07:00
James Dong
c640d420ed am d115304c: am 5a905ceb: Merge "Track maximum amplitude and fix getMaxAmplitude()" into gingerbread
Merge commit 'd115304c0900713d6f8d4033722d9c647f40ceae'

* commit 'd115304c0900713d6f8d4033722d9c647f40ceae':
  Track maximum amplitude and fix getMaxAmplitude()
2010-06-25 14:21:04 -07:00
Romain Guy
bb33b9b720 Merge "Implement quickReject() and drawRect()." 2010-06-25 13:43:21 -07:00
Jason Sams
d6b9dc4210 Merge "Add support for non-VBO drawing in Meshes." 2010-06-25 12:46:35 -07:00
Eric Laurent
8500df6989 am 8e103da1: Merge "Various fixes and improvements in audio effects implementation" into gingerbread
Merge commit '8e103da1f1b0656e3427b34b75f02d7ddf6073d5' into gingerbread-plus-aosp

* commit '8e103da1f1b0656e3427b34b75f02d7ddf6073d5':
  Various fixes and improvements in audio effects implementation
2010-06-25 12:38:31 -07:00
Andreas Huber
fdabbe8810 am 330dd304: Revert "fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger"
Merge commit '330dd304a471d260a73e342a240921c03c825f99' into gingerbread-plus-aosp

* commit '330dd304a471d260a73e342a240921c03c825f99':
  Revert "fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger"
2010-06-25 12:36:19 -07:00
Eric Laurent
7ed4797b7b Merge "Various fixes and improvements in audio effects implementation" into gingerbread 2010-06-25 12:35:30 -07:00
Eric Laurent
9bf80f02f7 Various fixes and improvements in audio effects implementation
Effect API:
- Use different definitions for audio device, channels, formats... in AudioSystem and EffectApi:
  Removed media/AudioCommon.h file created for initial version of EffectApi
- Indicate audio session and output ID to effect library when calling EffectCreate(). Session ID can be useful to optimize
the implementation of effect chains in the same audio session. Output ID can be used for effects implemented in audio hardware.
- Renamed EffectQueryNext() function to EffectQueryEffect() and changed operating mode:
  now an index is passed for the queried effect instead of implicitly querying the next one.
- Added CPU load and memory usage indication in effects descriptor
- Added flags and commands to indicate changes in audio mode (ring tone, in call...) to effect engine
- Added flag to indicate hardware accelerated effect implementation.
- Renamed EffectFactoryApi.h to EffectsFactoryApi.h for consistency with EffectsFactory.c/h

Effect libraries:
- Reflected changes in Effect API
- Several fixes in reverb implementation
- Added build option TEST_EFFECT_LIBRARIES in makefile to prepare integration of actual effect library.
- Replaced pointer by integer identifier for library handle returned by effects factory

Audio effect framework:
- Added support for audio session -1 in preparation of output stage effects configuration.
- Reflected changes in Effect API
- Removed volume ramp up/down when effect is inserted/removed: this has to be taken care of by effect engines.
- Added some overflow verification on indexes used for deferred parameter updates via shared memory
- Added hardcoded CPU and memory limit check when creating a new effect instance

Change-Id: I43fee5182ee201384ea3479af6d0acb95092901d
2010-06-25 11:59:35 -07:00
The Android Open Source Project
9af4e06e36 merge from froyo-plus-aosp
Change-Id: I0b5605e2b1c31593dc31abd62e275d0602db46eb
2010-06-25 11:23:56 -07:00
The Android Open Source Project
e1da0d7ca1 merge from froyo-plus-aosp
Change-Id: I8b8714eef0295bd5d731b3a0ef816392b1c51261
2010-06-25 11:22:27 -07:00
The Android Open Source Project
6c9227d821 merge from froyo-plus-aosp
Change-Id: I9bd45d66c9586b99635d7d05d1f351126bfc9840
2010-06-25 11:21:37 -07:00
The Android Open Source Project
cd00884e32 merge from froyo-plus-aosp
Change-Id: Ic1d0535cb746af0c53a5277b008061f7a2d973a2
2010-06-25 11:20:45 -07:00
The Android Open Source Project
41e3845b5d merge from froyo-plus-aosp
Change-Id: Ibaa84571e3b5a7ea29e55d41f773aa5f301086de
2010-06-25 11:18:59 -07:00
Vasu Nori
558e6a953d Merge "remove some not-so-useful-logging" 2010-06-25 11:16:28 -07:00
Andreas Huber
e049a957ce Revert "fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger"
This reverts commit 081bc5c47d8a980e6eafa70ddafcd89981586391.
2010-06-25 11:05:37 -07:00
Andreas Huber
8d0dbdeab3 am 357f8209: Merge "Finetune some of the prefetcher parameters to a) buffer as much as froyo did b) ensure that keepalives actually trigger a network read instead of just draining internal buffers" into gingerbread
Merge commit '357f8209f3aec63fa2779da4eeab8825f80b0a41' into gingerbread-plus-aosp

* commit '357f8209f3aec63fa2779da4eeab8825f80b0a41':
  Finetune some of the prefetcher parameters to a) buffer as much as froyo did b) ensure that keepalives actually trigger a network read instead of just draining internal buffers
2010-06-25 11:05:30 -07:00
Andreas Huber
deaaf5029a Merge "Finetune some of the prefetcher parameters to a) buffer as much as froyo did b) ensure that keepalives actually trigger a network read instead of just draining internal buffers" into gingerbread 2010-06-25 11:03:42 -07:00
James Dong
2972e7a8ac am 6feaa464: Enable passing parameters to the MediaWriter at runtime (at start() call).
Merge commit '6feaa46496bae85adbe10e84611592612f898081' into gingerbread-plus-aosp

* commit '6feaa46496bae85adbe10e84611592612f898081':
  Enable passing parameters to the MediaWriter at runtime (at start() call).
2010-06-25 10:57:12 -07:00
The Android Open Source Project
aa25569069 ignore from froyo-plus-aosp
Change-Id: I8144bf5c270b95c06252e7195b7cc2bc91452849
2010-06-25 10:51:16 -07:00
James Dong
f750cd89de am 5a905ceb: Merge "Track maximum amplitude and fix getMaxAmplitude()" into gingerbread
Merge commit '5a905ceb063bd31170d3d869efcd051cbd8e4e13' into gingerbread-plus-aosp

* commit '5a905ceb063bd31170d3d869efcd051cbd8e4e13':
  Track maximum amplitude and fix getMaxAmplitude()
2010-06-25 09:47:51 -07:00
James Dong
0284cd2386 Merge "Track maximum amplitude and fix getMaxAmplitude()" into gingerbread 2010-06-25 09:43:14 -07:00
Alex Sakhartchouk
2f08ad6cb8 Merge "Adding freetype font rendering to renderscript." 2010-06-25 09:24:19 -07:00
Jeff Hamilton
9acd654581 Revert "am 256fc043: am 081bc5c4: fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger"
This reverts commit e02dec8c4cbab17d09983af1328308b8aa61ef85, reversing
changes made to 6d7a052fb04b251c517d0a9049b8d5d7408ce8c0.

Bug: 2798567
2010-06-25 10:48:08 -05:00
Mathias Agopian
7223bde667 am 256fc043: am 081bc5c4: fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger
Merge commit '256fc04394431cbd332e56747fdbfda4cb4c2e25'

* commit '256fc04394431cbd332e56747fdbfda4cb4c2e25':
  fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger
2010-06-25 08:30:06 -07:00
Daniel Sandler
f343409174 am b9353372: am 8896783d: Updated StatusBar test app for new notifications API.
Merge commit 'b9353372f67dcb18bccb26165758a47cfe3197de'

* commit 'b9353372f67dcb18bccb26165758a47cfe3197de':
  Updated StatusBar test app for new notifications API.
2010-06-25 08:30:02 -07:00
Daniel Sandler
3c10135933 am bc4bc709: am 87160757: Basic handling of Notifications with fullScreenIntent.
Merge commit 'bc4bc709a819801a23aa604896ae2457ae710bec'

* commit 'bc4bc709a819801a23aa604896ae2457ae710bec':
  Basic handling of Notifications with fullScreenIntent.
2010-06-25 08:29:56 -07:00
Derek Sollenberger
976118b24a Merge "fix NullPointerException caused by inflating XML Webview that is defined to be non-visible." 2010-06-25 04:28:50 -07:00
Steve Block
d78ca15ec3 Merge "Fixes a few minor problems with AAPT" 2010-06-25 03:03:59 -07:00
Mathias Agopian
01420d4d47 am 081bc5c4: fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger
Merge commit '081bc5c47d8a980e6eafa70ddafcd89981586391' into gingerbread-plus-aosp

* commit '081bc5c47d8a980e6eafa70ddafcd89981586391':
  fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger
2010-06-24 21:36:37 -07:00
Mathias Agopian
01e4483b29 fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger
Make sure to not use GL_TEXTURE_EXTERNAL when it's not supported
by the GL. The error was harmless, but annoying.

Change-Id: I571a9a9b05d35da51420950a6a6e95629067efd0
2010-06-24 21:28:59 -07:00
Romain Guy
502e4aadf8 Merge "Add colored rectangles implementation in OpenGLRenderer." 2010-06-24 19:32:44 -07:00
Daniel Sandler
ddcc9cdce8 am 8896783d: Updated StatusBar test app for new notifications API.
Merge commit '8896783dc1d31c5274b277c364da0ffe7cc27cca' into gingerbread-plus-aosp

* commit '8896783dc1d31c5274b277c364da0ffe7cc27cca':
  Updated StatusBar test app for new notifications API.
2010-06-24 19:13:25 -07:00
Daniel Sandler
86514f07ca am 87160757: Basic handling of Notifications with fullScreenIntent.
Merge commit '87160757e827e8e158d233de09d70e7128184729' into gingerbread-plus-aosp

* commit '87160757e827e8e158d233de09d70e7128184729':
  Basic handling of Notifications with fullScreenIntent.
2010-06-24 19:13:22 -07:00
Scott Main
40d51b252b am 8ab65289: am 7dacda11: am 56c778e6: Merge "docs: Remove the TOS from download flow and remove TOS entirely because it\'s no longer relevant to the SDK download package" into froyo
Merge commit '8ab652896394526d8793973067b228eca34201a7'

* commit '8ab652896394526d8793973067b228eca34201a7':
  docs: Remove the TOS from download flow and remove TOS entirely because
2010-06-24 18:18:28 -07:00
Scott Main
82267d33d4 am 7dacda11: am 56c778e6: Merge "docs: Remove the TOS from download flow and remove TOS entirely because it\'s no longer relevant to the SDK download package" into froyo
Merge commit '7dacda1142379df1f1f9854c24e452acdea98436' into gingerbread-plus-aosp

* commit '7dacda1142379df1f1f9854c24e452acdea98436':
  docs: Remove the TOS from download flow and remove TOS entirely because
2010-06-24 18:16:31 -07:00
Scott Main
68a41d7f56 am 56c778e6: Merge "docs: Remove the TOS from download flow and remove TOS entirely because it\'s no longer relevant to the SDK download package" into froyo
Merge commit '56c778e6cfb2bd47ceae57d81e6b949da306e2e8' into froyo-plus-aosp

* commit '56c778e6cfb2bd47ceae57d81e6b949da306e2e8':
  docs: Remove the TOS from download flow and remove TOS entirely because
2010-06-24 18:14:06 -07:00
Scott Main
9a4a1d7104 am 56c778e6: Merge "docs: Remove the TOS from download flow and remove TOS entirely because it\'s no longer relevant to the SDK download package" into froyo
Merge commit '56c778e6cfb2bd47ceae57d81e6b949da306e2e8' into gingerbread

* commit '56c778e6cfb2bd47ceae57d81e6b949da306e2e8':
  docs: Remove the TOS from download flow and remove TOS entirely because
2010-06-24 18:12:49 -07:00
Scott Main
29d8e66ce0 Merge "docs: Remove the TOS from download flow and remove TOS entirely because it's no longer relevant to the SDK download package" into froyo 2010-06-24 18:10:41 -07:00
Jason Sams
467168d990 Merge "Fix return values for rsClamp." 2010-06-24 17:57:18 -07:00
Joe Onorato
b5a3decb70 am 0bf5cce9: am 0a0edcca: Merge "Fix the notification vibration setting and add a test app that lets you recover from the busted state." into gingerbread
Merge commit '0bf5cce9ee5f7db9932a8ba27e86836a9d96677c'

* commit '0bf5cce9ee5f7db9932a8ba27e86836a9d96677c':
  Fix the notification vibration setting and add a test app that lets you recover from the busted
2010-06-24 17:55:59 -07:00
Joe Onorato
824a9be4e9 am 0a0edcca: Merge "Fix the notification vibration setting and add a test app that lets you recover from the busted state." into gingerbread
Merge commit '0a0edccafbd464cfe52fdcb60597e1dd58ca73f9' into gingerbread-plus-aosp

* commit '0a0edccafbd464cfe52fdcb60597e1dd58ca73f9':
  Fix the notification vibration setting and add a test app that lets you recover from the busted
2010-06-24 17:53:28 -07:00