Commit Graph

16811 Commits

Author SHA1 Message Date
Eric Laurent
0d20832fbf am 030a1553: am 2ea200c5: Merge "Issue 2667801: [Audio Effect Framework] AudioFlinger, AudioMixer AudioTrack modifications." into kraken 2010-06-04 00:18:07 -07:00
Eric Laurent
bf0ce27523 am 2ea200c5: Merge "Issue 2667801: [Audio Effect Framework] AudioFlinger, AudioMixer AudioTrack modifications." into kraken 2010-06-04 00:16:05 -07:00
Eric Laurent
b5ac790af2 Merge "Issue 2667801: [Audio Effect Framework] AudioFlinger, AudioMixer AudioTrack modifications." into kraken 2010-06-04 00:14:46 -07:00
Doug Kwan
526213cf9b Merge "Add missing library to linker command line." 2010-06-03 22:53:25 -07:00
Wu-cheng Li
8b6e3d711a am 2f98f99c: am 5f5df382: Merge "Add camera metering mode API." into kraken 2010-06-03 22:35:40 -07:00
Wu-cheng Li
0acef241d2 am 5f5df382: Merge "Add camera metering mode API." into kraken 2010-06-03 22:33:15 -07:00
Wu-cheng Li
43189960f9 Merge "Add camera metering mode API." into kraken 2010-06-03 22:32:05 -07:00
Jing Yu
53766ecd2c Merge "Add missing libraries, in order for gold to work." 2010-06-03 21:05:51 -07:00
Kenny Root
b007e14a06 Merge "Fix alignment issues with RTL paragraphs." 2010-06-03 18:26:55 -07:00
Daisuke Miyakawa
7d67b7c507 Merge "Delete vCard code to platform/framework/opt/vcard." 2010-06-03 17:42:23 -07:00
Brad Fitzpatrick
7693aecf3b resolved conflicts for merge of 7d6362de to master
Change-Id: Ic26dd6d617f0edba549c992256511613df00caa6
2010-06-03 17:15:48 -07:00
Vasu Nori
c9cb2d1a66 Merge "set some members to final, set database errorhandler to default if null." 2010-06-03 16:46:31 -07:00
Brad Fitzpatrick
1d8b179857 am 266b74e8: Merge "Sprinkle new BlockGuard around SQLiteDatabase." into kraken 2010-06-03 16:09:35 -07:00
Brad Fitzpatrick
999cc236f9 Merge "Sprinkle new BlockGuard around SQLiteDatabase." into kraken 2010-06-03 16:07:51 -07:00
Andreas Huber
5be564ea7c am 17dabbdf: am b8c7548d: am e896d416: am 2e3761ba: Merge "Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle." into froyo 2010-06-03 15:35:35 -07:00
Andreas Huber
05ee92dcbb am b8c7548d: am e896d416: am 2e3761ba: Merge "Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle." into froyo 2010-06-03 15:33:35 -07:00
Andreas Huber
f2322f1623 am e896d416: am 2e3761ba: Merge "Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle." into froyo
Merge commit 'e896d41699ffe7be932102d7ccc9566f41ddb447' into kraken

* commit 'e896d41699ffe7be932102d7ccc9566f41ddb447':
  Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle.
2010-06-03 15:31:56 -07:00
Andreas Huber
dc9c0cb435 am 2e3761ba: Merge "Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle." into froyo
Merge commit '2e3761ba43f634e97ac493f4b79e5e53954a1491' into froyo-plus-aosp

* commit '2e3761ba43f634e97ac493f4b79e5e53954a1491':
  Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle.
2010-06-03 15:30:03 -07:00
Andreas Huber
da26806e79 Merge "Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle." into froyo 2010-06-03 15:28:13 -07:00
Daisuke Miyakawa
bf4a329ad6 Delete vCard code to platform/framework/opt/vcard.
Now all the code and related tests are in (top)/framework/opt/vcard.

See also 33mb46cb82 in platform/framework/opt/vcard.

Bug: 2735156
Change-Id: Ic3413110580874761e596b8fe9ad3c2e3c60795b
2010-06-03 15:22:10 -07:00
Vasu Nori
e8d3fe959b Merge "fix docs errors" 2010-06-03 14:59:51 -07:00
Jesse Wilson
2760b4bb6c Merge "Preloaded class list problems shall no longer break the build." 2010-06-03 14:24:56 -07:00
Dirk Dougherty
86aed8d27d am b7371455: am c458d0e3: am b85a1679: am 85a1c578: Merge "Doc change: Adjust security sandbox description." into froyo 2010-06-03 13:04:01 -07:00
Dirk Dougherty
12c155e828 am c458d0e3: am b85a1679: am 85a1c578: Merge "Doc change: Adjust security sandbox description." into froyo 2010-06-03 13:02:28 -07:00
Dirk Dougherty
7dba3e583b am b85a1679: am 85a1c578: Merge "Doc change: Adjust security sandbox description." into froyo
Merge commit 'b85a1679a4a6fae5dd39611ae594f5e2b945407c' into kraken

* commit 'b85a1679a4a6fae5dd39611ae594f5e2b945407c':
  Doc change: Adjust security sandbox description.
2010-06-03 13:00:31 -07:00
Dirk Dougherty
daca1ada02 am 85a1c578: Merge "Doc change: Adjust security sandbox description." into froyo
Merge commit '85a1c578300a0c9fb23aef5f79c9b1f3892e9c2e' into froyo-plus-aosp

* commit '85a1c578300a0c9fb23aef5f79c9b1f3892e9c2e':
  Doc change: Adjust security sandbox description.
2010-06-03 12:58:35 -07:00
Dirk Dougherty
c253940208 Merge "Doc change: Adjust security sandbox description." into froyo 2010-06-03 12:57:06 -07:00
Vasu Nori
634cfad8da Merge "new API in Context. on openDatabase, new param DatabaseErrorHandler" 2010-06-03 12:42:32 -07:00
Romain Guy
c551270f61 Merge "Fix memory leak in LocalActivityManager. Also properly removes embedded activities. Bug #2738247" 2010-06-03 12:39:53 -07:00
Vasu Nori
2070181116 Merge "add API to Cursor to get column value type" 2010-06-03 11:46:03 -07:00
James Dong
09208ce416 am a3d1c3cd: am 57ad0703: am c40209ac: am 28a92b2e: Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into froyo 2010-06-03 11:34:36 -07:00
James Dong
96fa949f66 am 57ad0703: am c40209ac: am 28a92b2e: Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into froyo 2010-06-03 11:32:29 -07:00
James Dong
37d5dbc742 am c40209ac: am 28a92b2e: Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into froyo
Merge commit 'c40209ac60a64a7c08b0d0028060d5308fd7a0b8' into kraken

* commit 'c40209ac60a64a7c08b0d0028060d5308fd7a0b8':
  Fix a Javadoc to clarify when setAudioStreamType() should be called.
2010-06-03 11:30:03 -07:00
James Dong
1ce3ee8a00 am 28a92b2e: Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into froyo
Merge commit '28a92b2e76a13c18dc23e5239717b122a174182f' into froyo-plus-aosp

* commit '28a92b2e76a13c18dc23e5239717b122a174182f':
  Fix a Javadoc to clarify when setAudioStreamType() should be called.
2010-06-03 11:27:19 -07:00
James Dong
c1cf2705d5 Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into froyo 2010-06-03 11:26:09 -07:00
Vasu Nori
7a34c4964f Merge "cleanup some small but ugly things. all minor things." 2010-06-03 11:07:20 -07:00
Romain Guy
21aa0e0110 Merge "Do not invoke onProgressUpdate if the task is canceled. Bug #2734382" 2010-06-03 10:58:05 -07:00
Derek Sollenberger
93a5f50e04 Merge "Update EmbeddedZoomControl to use new ZoomManager methods." 2010-06-03 10:35:04 -07:00
Derek Sollenberger
87f4acfd4b Merge "Refactor zoom logic from WebView to ZoomManager." 2010-06-03 10:07:05 -07:00
Kenny Root
fe68d385b7 am 5095232d: am 15fe2cb7: Add error checking for translatable strings 2010-06-03 09:37:14 -07:00
Kenny Root
3678042be7 am 15fe2cb7: Add error checking for translatable strings 2010-06-03 09:36:00 -07:00
The Android Open Source Project
3c17b38b61 am 913dbc50: am a9f06fef: am ee7e6a78: merge from open-source master 2010-06-03 09:12:40 -07:00
The Android Open Source Project
54821476ae am a9f06fef: am ee7e6a78: merge from open-source master 2010-06-03 09:10:54 -07:00
The Android Open Source Project
2519d6ce45 am ee7e6a78: merge from open-source master
Merge commit 'ee7e6a78e28b360826f215e0e84d43b1513b6401' into kraken

* commit 'ee7e6a78e28b360826f215e0e84d43b1513b6401':
  Improved error-handling in Rfc822Tokenizer
2010-06-03 09:09:07 -07:00
The Android Open Source Project
1531d2f979 merge from open-source master
Change-Id: Idf8d5661d7b261b74ac0b1271af98795ac5faff9
2010-06-03 09:03:58 -07:00
Leon Clarke
fa80385504 Merge "Add indexeddb files to the skip list" 2010-06-03 07:05:47 -07:00
Mike Lockwood
6a65d8a9a2 Merge "Prototype Content Provider support for MTP/PTP devices." 2010-06-03 06:00:45 -07:00
Eric Laurent
eafff459aa Issue 2667801: [Audio Effect Framework] AudioFlinger, AudioMixer AudioTrack modifications.
First drop of audio framework modifications for audio effects support.

- AudioTrack/AudioRecord:
Added support for auxiliary effects in AudioTrack
Added support for audio sessions
Fixed left right channel inversion in setVolume()

- IAudioFlinger:
Added interface methods for effect enumeraiton and instantiation
Added support for audio sessions.

- IAudioTrack:
Added method to attach auxiliary effect.

- AudioFlinger
Created new classes to control effect engines in effect library and manage effect connections to tracks or
output mix:
  EffectModule: wrapper object controlling the effect engine implementation in the effect library. There
	is one EffectModule per instance of an effect in a given audio session
  EffectChain: group of effects associated to one audio session. There is one EffectChain per audio session.
	EffectChain for session 0 is for output mix effects, other chains are attached to audio tracks
	with same session ID. Each chain contains a variable number of EffectModules
  EffectHandle: implements the IEffect interface. There is one EffectHandle object for each application
	controlling (or using) an effect module. THe EffectModule maintians a list of EffectHandles.

Added support for effect modules and effect chains creation in PlaybackThread.
modified mixer thread loop to allow track volume control by effect modules and call effect processing.

-AudioMixer
Each track now specifies its output buffer used by mixer for accumulation
Modified mixer process functions to process tracks by groups of tracks with same buffer
Modified track process functions to support accumulation to auxiliary channel

Change-Id: I26d5f7c9e070a89bdd383e1a659f8b7ca150379c
2010-06-03 03:21:53 -07:00
Jeff Brown
ccf77ae308 am 1bcc845f: am ca583f09: Merge "Fixed some minor bugs in MotionEvent recycling." into kraken 2010-06-02 22:41:30 -07:00
Joe Onorato
117b926974 am 5e76d148: am 169af47b: remove logging 2010-06-02 22:41:20 -07:00