OSDN Git Service
Jeff Brown [Mon, 14 Jun 2010 00:55:28 +0000 (17:55 -0700)]
am
46b9ac0a: Native input dispatch rewrite work in progress.
Merge commit '
46b9ac0ae2162309774a7478cd9d4e578747bfc2' into gingerbread
* commit '
46b9ac0ae2162309774a7478cd9d4e578747bfc2':
Native input dispatch rewrite work in progress.
Jeff Brown [Fri, 23 Apr 2010 01:58:52 +0000 (18:58 -0700)]
Native input dispatch rewrite work in progress.
The old dispatch mechanism has been left in place and continues to
be used by default for now. To enable native input dispatch,
edit the ENABLE_NATIVE_DISPATCH constant in WindowManagerPolicy.
Includes part of the new input event NDK API. Some details TBD.
To wire up input dispatch, as the ViewRoot adds a window to the
window session it receives an InputChannel object as an output
argument. The InputChannel encapsulates the file descriptors for a
shared memory region and two pipe end-points. The ViewRoot then
provides the InputChannel to the InputQueue. Behind the
scenes, InputQueue simply attaches handlers to the native PollLoop object
that underlies the MessageQueue. This way MessageQueue doesn't need
to know anything about input dispatch per-se, it just exposes (in native
code) a PollLoop that other components can use to monitor file descriptor
state changes.
There can be zero or more targets for any given input event. Each
input target is specified by its input channel and some parameters
including flags, an X/Y coordinate offset, and the dispatch timeout.
An input target can request either synchronous dispatch (for foreground apps)
or asynchronous dispatch (fire-and-forget for wallpapers and "outside"
targets). Currently, finding the appropriate input targets for an event
requires a call back into the WindowManagerServer from native code.
In the future this will be refactored to avoid most of these callbacks
except as required to handle pending focus transitions.
End-to-end event dispatch mostly works!
To do: event injection, rate limiting, ANRs, testing, optimization, etc.
Change-Id: I8c36b2b9e0a2d27392040ecda0f51b636456de25
Brad Fitzpatrick [Sat, 12 Jun 2010 01:27:20 +0000 (18:27 -0700)]
Merge "More StrictMode work, handling violations in ActivityManagerService." into gingerbread
Dirk Dougherty [Fri, 11 Jun 2010 23:56:04 +0000 (16:56 -0700)]
am
1067e689: Merge "Doc change: remove pdf summary of guidelines from templates archive." into froyo
Merge commit '
1067e6895e941f56edc7bc3d7c16a7122fb5259b' into gingerbread
* commit '
1067e6895e941f56edc7bc3d7c16a7122fb5259b':
Doc change: remove pdf summary of guidelines from templates archive.
Dirk Dougherty [Fri, 11 Jun 2010 23:49:14 +0000 (16:49 -0700)]
Merge "Doc change: remove pdf summary of guidelines from templates archive." into froyo
Andreas Huber [Fri, 11 Jun 2010 22:58:19 +0000 (15:58 -0700)]
Merge "Must hold lock here..." into gingerbread
Irfan Sheriff [Fri, 11 Jun 2010 22:28:24 +0000 (15:28 -0700)]
Merge "Dont persist config on failure" into gingerbread
James Dong [Fri, 11 Jun 2010 21:28:55 +0000 (14:28 -0700)]
Merge "Initial checkin for pause and resume control" into kraken
Dianne Hackborn [Fri, 11 Jun 2010 17:53:16 +0000 (10:53 -0700)]
Merge "Adjust activity manager process OOM adj." into kraken
Andreas Huber [Fri, 11 Jun 2010 17:52:00 +0000 (10:52 -0700)]
Merge "Restore feature parity with the old HTTPDataSource as far as support for extra headers (cookies?) and socket-timeout are concerned." into kraken
Chih-Chung Chang [Thu, 10 Jun 2010 05:32:16 +0000 (13:32 +0800)]
Change camera interface to support multiple cameras.
Change-Id: Ie88fe706d2278acf762eca87780de349434778a4
Irfan Sheriff [Fri, 11 Jun 2010 01:59:42 +0000 (18:59 -0700)]
am
9f2a0115: Merge "Remove indefinite DHCP retries" into froyo
Merge commit '
9f2a0115220c8e288c32d8cf90e235a2f2be115b' into kraken
* commit '
9f2a0115220c8e288c32d8cf90e235a2f2be115b':
Remove indefinite DHCP retries
Irfan Sheriff [Fri, 11 Jun 2010 01:56:04 +0000 (18:56 -0700)]
Merge "Remove indefinite DHCP retries" into froyo
Mathias Agopian [Fri, 11 Jun 2010 00:12:42 +0000 (17:12 -0700)]
Merge "fix [
2757903] Crash in EGL when creating an EGLSurface" into kraken
Mike Lockwood [Thu, 10 Jun 2010 22:30:41 +0000 (15:30 -0700)]
am
f4a502a2: Merge "Don\'t adjust lights if screen or button brightness is changed when the screen is off." into froyo
Merge commit '
f4a502a235e9f9ea0bcd2d5ca4981dc6e1a619c4' into kraken
* commit '
f4a502a235e9f9ea0bcd2d5ca4981dc6e1a619c4':
Don't adjust lights if screen or button brightness is changed when the screen is off.
Mike Lockwood [Thu, 10 Jun 2010 22:28:31 +0000 (15:28 -0700)]
Merge "Don't adjust lights if screen or button brightness is changed when the screen is off." into froyo
Andreas Huber [Thu, 10 Jun 2010 22:15:50 +0000 (15:15 -0700)]
Merge "Simplify the code in the stagefright commandline utility." into kraken
Andreas Huber [Thu, 10 Jun 2010 22:15:43 +0000 (15:15 -0700)]
Merge "Switch LiveSource to use the new http data source instead of the old one." into kraken
Andreas Huber [Thu, 10 Jun 2010 22:15:37 +0000 (15:15 -0700)]
Merge "Fix String8 to free its memory only after assignment operations based on pointers are finished in case that pointer referred to the string's original contents." into kraken
Andreas Huber [Thu, 10 Jun 2010 22:15:29 +0000 (15:15 -0700)]
Merge "Initial check-in of new caching/prefetching data source implementation." into kraken
Adam Powell [Thu, 10 Jun 2010 21:13:51 +0000 (14:13 -0700)]
am
8f2ca788: Merge "Fix bug
2757693 - Multi-touch coordinates can jump when a finger goes down." into froyo
Merge commit '
8f2ca788f369892370477212cf9e7a67721a8c16' into kraken
* commit '
8f2ca788f369892370477212cf9e7a67721a8c16':
Fix bug
2757693 - Multi-touch coordinates can jump when a finger goes down.
Adam Powell [Thu, 10 Jun 2010 21:09:50 +0000 (14:09 -0700)]
Merge "Fix bug
2757693 - Multi-touch coordinates can jump when a finger goes down." into froyo
Andreas Huber [Thu, 10 Jun 2010 19:41:05 +0000 (12:41 -0700)]
Merge "Support "pausing" of MediaSources with the effect that they no longer pull on their upstream source until a subsequent read-with-seek." into kraken
Andreas Huber [Thu, 10 Jun 2010 19:40:39 +0000 (12:40 -0700)]
Merge "Initial check in of a new http data source implementation." into kraken
Nick Kralevich [Thu, 10 Jun 2010 18:54:53 +0000 (11:54 -0700)]
Andreas Huber [Thu, 10 Jun 2010 18:14:26 +0000 (11:14 -0700)]
Fix String8 to free its memory only after assignment operations based on pointers are finished in case that pointer referred to the string's original contents.
Change-Id: I6961f3cf10ba3b728579ea63262db750a4cf8577
James Dong [Thu, 10 Jun 2010 17:14:38 +0000 (10:14 -0700)]
Merge "Remove the lock/unlock workaround from CameraService" into kraken
Andreas Huber [Thu, 10 Jun 2010 17:12:57 +0000 (10:12 -0700)]
Merge "Apparently the TI video decoder only supports H.264 up to baseline profile/level 3, not level 3.x as previously assumed." into kraken
Kenny Root [Thu, 10 Jun 2010 05:31:32 +0000 (22:31 -0700)]
am
b00854d4: Import revised translations
Merge commit '
b00854d4c07ee8c810d1e32984543297bfa80a8e' into kraken
* commit '
b00854d4c07ee8c810d1e32984543297bfa80a8e':
Import revised translations
James Dong [Wed, 9 Jun 2010 22:57:48 +0000 (15:57 -0700)]
Remove the lock/unlock workaround from CameraService
bug -
2677772
Change-Id: I7c996daad8b3bfc89e9fa2d655dc18c9a5c68f2f
Mathias Agopian [Thu, 10 Jun 2010 02:54:29 +0000 (19:54 -0700)]
Merge changes I00274431,I83be9404,I0359531a,Iceef1e95 into kraken
* changes:
update EGL headers to the latest
update GL ES stub libraries with the new GL ES headers
fix OpenGL ES extension headers from khronos
update the OpenGL ES headers to the latest
Mathias Agopian [Thu, 10 Jun 2010 01:46:35 +0000 (18:46 -0700)]
update EGL headers to the latest
note that this doesn't update the EGL stubs.
Change-Id: I00274431a490249d93eb6b5ba13f274b7f2682ae
Mathias Agopian [Thu, 10 Jun 2010 01:20:21 +0000 (18:20 -0700)]
update GL ES stub libraries with the new GL ES headers
Change-Id: I83be94049ddfe3fd7f5bee71a21172ade1498dd5
Mathias Agopian [Thu, 10 Jun 2010 01:19:11 +0000 (18:19 -0700)]
fix OpenGL ES extension headers from khronos
the official headers have a couple typos, which
this CL fixes.
Change-Id: I0359531a05a4a62ddbdce70c5841ec1c355feb3b
Mathias Agopian [Thu, 10 Jun 2010 01:08:15 +0000 (18:08 -0700)]
update the OpenGL ES headers to the latest
Change-Id: Iceef1e95504897a5e3759b0401cf7031c9e74547
Nick Kralevich [Wed, 9 Jun 2010 21:49:10 +0000 (14:49 -0700)]
Merge "Fix a problem with leaking UDP sockets." into kraken
Joe Onorato [Wed, 9 Jun 2010 21:44:58 +0000 (14:44 -0700)]
Merge changes Ia5884ef4,Ie495a41d,I3f7066c2,If5faf446,I6ae0740f,I57b2d296,Iea78a637 into kraken
* changes:
Add a test item the turns on a bunch of extra icons.
Move the status bar icon list, hopefully for the last time.
Call into the notification manager when the panel is revealed.
Move status_bar_latest_event and LatestItemView into SystemUI.apk.
Start the status bar service based on a configuration option, instead of trampolining through a braodcast receiver.
Require the STATUS_BAR_SERVICE permission for something to be the status bar.
Handle errors inflating notifications (and their icons).
Joe Onorato [Wed, 9 Jun 2010 21:43:47 +0000 (14:43 -0700)]
Merge changes I4a11f027,Ib2c4abf6,Id0c7ef9f,I839d7771 into kraken
* changes:
dead code removal
Cap the number of notifications that a given package can post.
Move the usb mass storage notification & activity into SystemUI.apk.
Add some disabled logging and another test case for reapplying the notification views.
Christopher Tate [Wed, 9 Jun 2010 19:25:05 +0000 (12:25 -0700)]
Merge "Fail gracefully if the user fails to supply necessary args to bmgr" into kraken
Mathias Agopian [Wed, 9 Jun 2010 03:14:11 +0000 (20:14 -0700)]
Merge "allow re-targetting of surfaces" into kraken
Mathias Agopian [Wed, 9 Jun 2010 02:54:15 +0000 (19:54 -0700)]
allow re-targetting of surfaces
Surfaces can now be parcelized and sent to remote
processes. When a surface crosses a process
boundary, it looses its connection with the
current process and gets attached to the new one.
Change-Id: I39c7b055bcd3ea1162ef2718d3d4b866bf7c81c0
Jim Miller [Tue, 8 Jun 2010 23:33:26 +0000 (16:33 -0700)]
am
75b6a6b9: Merge "Fix
2737842: Disable KeguardManager API if device policy is enabled" into froyo
Merge commit '
75b6a6b972e6b18143fd629d3d9c824c442c5f4c' into kraken
* commit '
75b6a6b972e6b18143fd629d3d9c824c442c5f4c':
Fix
2737842: Disable KeguardManager API if device policy is enabled
Jim Miller [Tue, 8 Jun 2010 23:31:32 +0000 (16:31 -0700)]
Merge "Fix
2737842: Disable KeguardManager API if device policy is enabled" into froyo
Mathias Agopian [Tue, 8 Jun 2010 22:40:56 +0000 (15:40 -0700)]
fix [
2751143] Device crashes when in a text box for too long
James Dong [Tue, 8 Jun 2010 20:13:26 +0000 (13:13 -0700)]
Merge "Remove some hard-coded encoding parameters" into kraken
Romain Guy [Tue, 8 Jun 2010 20:00:30 +0000 (13:00 -0700)]
am
71d73a0d: Merge "Add a method to hide/show a SurfaceView\'s surface." into froyo
Merge commit '
71d73a0dfc110d0bdfc1b7ba385db3e2cfe007e5' into kraken
* commit '
71d73a0dfc110d0bdfc1b7ba385db3e2cfe007e5':
Add a method to hide/show a SurfaceView's surface.
Romain Guy [Tue, 8 Jun 2010 19:59:36 +0000 (12:59 -0700)]
Merge "Add a method to hide/show a SurfaceView's surface." into froyo
Brad Fitzpatrick [Tue, 8 Jun 2010 19:37:34 +0000 (12:37 -0700)]
Merge "Log.wtf when databases go to be downgraded." into kraken
James Dong [Tue, 8 Jun 2010 17:14:26 +0000 (10:14 -0700)]
Merge "Second part of speeding up video recording frame rate" into kraken
Andreas Huber [Tue, 8 Jun 2010 16:19:07 +0000 (09:19 -0700)]
Merge "Initial checkin of preliminary rtsp support for stagefright." into kraken
Jim Miller [Tue, 8 Jun 2010 04:23:53 +0000 (21:23 -0700)]
Jim Miller [Tue, 8 Jun 2010 02:25:49 +0000 (19:25 -0700)]
am
bde25c20: Merge "Fix
2737842: disable keyguard API when device policy is enabled." into froyo
Merge commit '
bde25c207731783a62e3611586fe05cd35add0d9' into kraken
* commit '
bde25c207731783a62e3611586fe05cd35add0d9':
Fix
2737842: disable keyguard API when device policy is enabled.
Jim Miller [Tue, 8 Jun 2010 02:24:45 +0000 (19:24 -0700)]
Merge "Fix
2737842: disable keyguard API when device policy is enabled." into froyo
Christopher Tate [Tue, 8 Jun 2010 01:48:27 +0000 (18:48 -0700)]
am
ac24d23c: Merge "Don\'t bring up Launcher until after boot complete" into froyo
Merge commit '
ac24d23cd4a96f38b4e9cb0318a7c298794b9b6a' into kraken
* commit '
ac24d23cd4a96f38b4e9cb0318a7c298794b9b6a':
Don't bring up Launcher until after boot complete
Christopher Tate [Tue, 8 Jun 2010 01:46:46 +0000 (18:46 -0700)]
Merge "Don't bring up Launcher until after boot complete" into froyo
Dianne Hackborn [Tue, 8 Jun 2010 01:32:04 +0000 (18:32 -0700)]
am
d1d9047d: Merge "Fix issue #
2749322: addPackageToPreferred throws SecurityException" into froyo
Merge commit '
d1d9047d5c34fb05be08099fa8cd73e4301ee0ff' into kraken
* commit '
d1d9047d5c34fb05be08099fa8cd73e4301ee0ff':
Fix issue #
2749322: addPackageToPreferred throws SecurityException
Dianne Hackborn [Tue, 8 Jun 2010 00:32:02 +0000 (17:32 -0700)]
Merge "Fix issue #
2749322: addPackageToPreferred throws SecurityException" into froyo
Robert Greenwalt [Mon, 7 Jun 2010 23:59:01 +0000 (16:59 -0700)]
am
5a671d03: Cut logging, boost efficiency of ThrottleService
Merge commit '
5a671d03e3abe522a761a43b0460f9f3816b14ed' into kraken
* commit '
5a671d03e3abe522a761a43b0460f9f3816b14ed':
Cut logging, boost efficiency of ThrottleService
Andreas Huber [Mon, 7 Jun 2010 22:20:14 +0000 (15:20 -0700)]
Merge "Initial checkin of preliminary support for "http live" streaming in stagefright." into kraken
Jaikumar Ganesh [Mon, 7 Jun 2010 21:10:08 +0000 (14:10 -0700)]
Merge "Serialize all commands for a particular profile." into kraken
Jaikumar Ganesh [Mon, 7 Jun 2010 21:09:49 +0000 (14:09 -0700)]
Merge "Pass BluetoothDevice to the Bluetooth Headset calls." into kraken
Jaikumar Ganesh [Mon, 7 Jun 2010 21:09:39 +0000 (14:09 -0700)]
Merge "Add a new state machine for handling the incoming / outgoing profile connections." into kraken
David 'Digit' Turner [Mon, 7 Jun 2010 21:02:38 +0000 (14:02 -0700)]
Merge "PackageManagerService: always install native binaries from .apk" into kraken
Andreas Huber [Mon, 7 Jun 2010 19:50:05 +0000 (12:50 -0700)]
Merge "Initial checkin of "foundation" library for future stagefright development." into kraken
James Dong [Mon, 7 Jun 2010 17:19:58 +0000 (10:19 -0700)]
Merge "Remove hard-coded pixel format for recording frames in CameraSource. Retrieve the pixel format from Camera HAL at runtime." into kraken
Christopher Tate [Sun, 6 Jun 2010 19:10:08 +0000 (12:10 -0700)]
am
df2e2eff: Merge "Watchdog now records kernel stacks when it fires" into froyo
Merge commit '
df2e2eff9446c0220515fa7aab7857135e04e12e' into kraken
* commit '
df2e2eff9446c0220515fa7aab7857135e04e12e':
Watchdog now records kernel stacks when it fires
Dianne Hackborn [Sun, 6 Jun 2010 19:10:05 +0000 (12:10 -0700)]
Robert Greenwalt [Sun, 6 Jun 2010 19:10:00 +0000 (12:10 -0700)]
am
f9610b38: Merge "Make the DUN apn data secure." into froyo
Merge commit '
f9610b3842e030138c1dc327a3a467aaea02c227' into kraken
* commit '
f9610b3842e030138c1dc327a3a467aaea02c227':
Make the DUN apn data secure.
Mathias Agopian [Sat, 5 Jun 2010 01:26:32 +0000 (18:26 -0700)]
optimize Surface.readFromParcel()
this is called for each relayout() and used to create a full Surface (cpp)
which in turn did some heavy work (including an IPC with surfaceflinger),
most of the time to destroy it immediatelly when the returned surface
(the one in the parcel) was the same.
we now more intelligentely read from the parcel and construct the new
object only if needed.
Change-Id: Idfd40d9ac96ffc6d4ae5fd99bcc0773e131e2267
Mathias Agopian [Tue, 1 Jun 2010 22:12:58 +0000 (15:12 -0700)]
split surface management from surface's buffers management
Change-Id: If3c5655d1231f8f0c49ba68f972b1b20c93b3f87
Mathias Agopian [Thu, 3 Jun 2010 06:28:45 +0000 (23:28 -0700)]
clean-up client management.
simplified things a lot, the biggest change is that the concept
of "ClientID" is now gone, instead we simply use references.
Change-Id: Icbc57f80865884aa5f35ad0d0a0db26f19f9f7ce
Christopher Tate [Sat, 5 Jun 2010 01:06:07 +0000 (18:06 -0700)]
Merge "Watchdog now records kernel stacks when it fires" into froyo
Dianne Hackborn [Fri, 4 Jun 2010 23:32:01 +0000 (16:32 -0700)]
Merge "xhdpi" into froyo
Robert Greenwalt [Fri, 4 Jun 2010 22:55:09 +0000 (15:55 -0700)]
Merge "Make the DUN apn data secure." into froyo
Jeff Hamilton [Fri, 4 Jun 2010 20:52:45 +0000 (13:52 -0700)]
am
1e2e2aea: am
4b330921: Don\'t crash when low storage is encountered pre-boot completion.
Merge commit '
1e2e2aea8ce3b1c39f4d0f753e3f7081c94a0bac' into kraken
* commit '
1e2e2aea8ce3b1c39f4d0f753e3f7081c94a0bac':
Don't crash when low storage is encountered pre-boot completion.
Jeff Hamilton [Fri, 4 Jun 2010 20:50:31 +0000 (13:50 -0700)]
am
4b330921: Don\'t crash when low storage is encountered pre-boot completion.
Merge commit '
4b3309211ed6f3532b44481945a4725143d50b8a' into froyo-plus-aosp
* commit '
4b3309211ed6f3532b44481945a4725143d50b8a':
Don't crash when low storage is encountered pre-boot completion.
Dianne Hackborn [Fri, 4 Jun 2010 20:30:32 +0000 (13:30 -0700)]
Merge "Add support for heavy-weight applications." into kraken
The Android Open Source Project [Fri, 4 Jun 2010 19:58:09 +0000 (12:58 -0700)]
am
2d743fe2: merge from open-source master
Merge commit '
2d743fe2f39397d41334001d897eb78da56e94ef' into kraken
* commit '
2d743fe2f39397d41334001d897eb78da56e94ef':
Add better error handling for savePicture and restorePicture
The Android Open Source Project [Fri, 4 Jun 2010 18:07:49 +0000 (11:07 -0700)]
merge from open-source master
Change-Id: Ic9060d92c014d6cbe9d90ce8deca8fa111711471
Jaikumar Ganesh [Fri, 4 Jun 2010 16:46:03 +0000 (09:46 -0700)]
Merge "Delete local references to avoid reference table overflow." into kraken
Wu-cheng Li [Fri, 4 Jun 2010 10:38:25 +0000 (03:38 -0700)]
Merge "Add KEY_SUPPORTED_METERING_MODES and fix some typos." into kraken
Eric Laurent [Fri, 4 Jun 2010 07:14:46 +0000 (00:14 -0700)]
Merge "Issue
2667801: [Audio Effect Framework] AudioFlinger, AudioMixer AudioTrack modifications." into kraken
Wu-cheng Li [Fri, 4 Jun 2010 05:32:05 +0000 (22:32 -0700)]
Merge "Add camera metering mode API." into kraken
Brad Fitzpatrick [Thu, 3 Jun 2010 23:07:51 +0000 (16:07 -0700)]
Merge "Sprinkle new BlockGuard around SQLiteDatabase." into kraken
Andreas Huber [Thu, 3 Jun 2010 22:31:56 +0000 (15:31 -0700)]
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.
Andreas Huber [Thu, 3 Jun 2010 22:30:03 +0000 (15:30 -0700)]
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.
Andreas Huber [Thu, 3 Jun 2010 22:28:13 +0000 (15:28 -0700)]
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
Romain Guy [Thu, 3 Jun 2010 21:26:21 +0000 (14:26 -0700)]
Merge "Add better error handling for savePicture and restorePicture"
Dirk Dougherty [Thu, 3 Jun 2010 20:00:31 +0000 (13:00 -0700)]
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.
Dirk Dougherty [Thu, 3 Jun 2010 19:58:35 +0000 (12:58 -0700)]
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.
Dirk Dougherty [Thu, 3 Jun 2010 19:57:06 +0000 (12:57 -0700)]
Merge "Doc change: Adjust security sandbox description." into froyo
James Dong [Thu, 3 Jun 2010 18:30:03 +0000 (11:30 -0700)]
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.
James Dong [Thu, 3 Jun 2010 18:27:19 +0000 (11:27 -0700)]
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.
James Dong [Thu, 3 Jun 2010 18:26:09 +0000 (11:26 -0700)]
Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into froyo
The Android Open Source Project [Thu, 3 Jun 2010 16:09:07 +0000 (09:09 -0700)]
am
ee7e6a78: merge from open-source master
Merge commit '
ee7e6a78e28b360826f215e0e84d43b1513b6401' into kraken
* commit '
ee7e6a78e28b360826f215e0e84d43b1513b6401':
Improved error-handling in Rfc822Tokenizer
The Android Open Source Project [Thu, 3 Jun 2010 16:03:58 +0000 (09:03 -0700)]
merge from open-source master
Change-Id: Idf8d5661d7b261b74ac0b1271af98795ac5faff9
Eric Laurent [Wed, 2 Jun 2010 06:49:17 +0000 (23:49 -0700)]
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
Jeff Brown [Wed, 2 Jun 2010 22:46:13 +0000 (15:46 -0700)]
Merge "Fixed some minor bugs in MotionEvent recycling." into kraken
Scott Main [Wed, 2 Jun 2010 20:46:53 +0000 (13:46 -0700)]
am
105e1c5a: am
6a297118: Merge "docs: a couple doc bug fixes" into froyo
Merge commit '
105e1c5adc3da14996d659ac403e7254b81bcb76' into kraken
* commit '
105e1c5adc3da14996d659ac403e7254b81bcb76':
docs: a couple doc bug fixes
Scott Main [Wed, 2 Jun 2010 20:44:44 +0000 (13:44 -0700)]
am
6a297118: Merge "docs: a couple doc bug fixes" into froyo
Merge commit '
6a297118724f31b1063b74f52295d459ec4f58dc' into froyo-plus-aosp
* commit '
6a297118724f31b1063b74f52295d459ec4f58dc':
docs: a couple doc bug fixes