OSDN Git Service
Mathias Agopian [Tue, 18 May 2010 03:10:24 +0000 (20:10 -0700)]
Merge "add a few tests to SharedBufferStackTest" into kraken
Mathias Agopian [Tue, 18 May 2010 03:08:22 +0000 (20:08 -0700)]
add a few tests to SharedBufferStackTest
Change-Id: I1c46c07aa1483aee4d4ebd8745638a2c462cc1b3
Mathias Agopian [Tue, 18 May 2010 01:57:46 +0000 (18:57 -0700)]
Merge "improve SharedBufferStack test" into kraken
Mathias Agopian [Tue, 18 May 2010 01:56:10 +0000 (18:56 -0700)]
improve SharedBufferStack test
Change-Id: I32683bfe0916918757280db89113595867acd5a7
Mathias Agopian [Tue, 18 May 2010 01:55:47 +0000 (18:55 -0700)]
Merge "fix a bug where queueBuffer() would fail after the SharedbufferStack is resized" into kraken
Mathias Agopian [Tue, 18 May 2010 01:54:19 +0000 (18:54 -0700)]
fix a bug where queueBuffer() would fail after the SharedbufferStack is resized
Change-Id: I12bf13a62018ce1349bab7be0b0cad7fad13fee8
Scott Main [Tue, 18 May 2010 01:04:07 +0000 (18:04 -0700)]
am
fbb285e6: am
e64256d6: Merge "docs: revise webview description and add info for targeting screen densities" into froyo
Merge commit '
fbb285e67f6b150440647d0c484d88edb7bf9be9' into kraken
* commit '
fbb285e67f6b150440647d0c484d88edb7bf9be9':
docs: revise webview description and add info for targeting screen densities
Scott Main [Tue, 18 May 2010 01:01:28 +0000 (18:01 -0700)]
am
e64256d6: Merge "docs: revise webview description and add info for targeting screen densities" into froyo
Merge commit '
e64256d610ec5ea3df5db8a24333a6ce98b83d49' into froyo-plus-aosp
* commit '
e64256d610ec5ea3df5db8a24333a6ce98b83d49':
docs: revise webview description and add info for targeting screen densities
Scott Main [Tue, 18 May 2010 00:59:37 +0000 (17:59 -0700)]
Merge "docs: revise webview description and add info for targeting screen densities" into froyo
Dirk Dougherty [Tue, 18 May 2010 00:40:09 +0000 (17:40 -0700)]
am
b2fa79e3: am
6750bb7f: Doc change: add link to source.android.com
Merge commit '
b2fa79e3723b448114181fef983deaae97b44161' into kraken
* commit '
b2fa79e3723b448114181fef983deaae97b44161':
Doc change: add link to source.android.com
Dirk Dougherty [Tue, 18 May 2010 00:37:28 +0000 (17:37 -0700)]
am
6750bb7f: Doc change: add link to source.android.com
Merge commit '
6750bb7f838b15ef25544d7aa66b17119fcd7227' into froyo-plus-aosp
* commit '
6750bb7f838b15ef25544d7aa66b17119fcd7227':
Doc change: add link to source.android.com
Mathias Agopian [Tue, 18 May 2010 00:29:52 +0000 (17:29 -0700)]
Merge "fix some bugs in SharedBufferStack::resize" into kraken
Mathias Agopian [Tue, 18 May 2010 00:27:26 +0000 (17:27 -0700)]
fix some bugs in SharedBufferStack::resize
added buffers should now be labeled properly.
Change-Id: I28aa753fbe89ab89134e7753575319478934c7fa
Dirk Dougherty [Tue, 18 May 2010 00:08:27 +0000 (17:08 -0700)]
am
429e8e3a: am
6bb6348f: Doc change: cherry pick from eclair ->docs: add dashboard for screens update platform dashboard
Merge commit '
429e8e3a7333a162de352b158c15c61a7ab65807' into kraken
* commit '
429e8e3a7333a162de352b158c15c61a7ab65807':
Doc change: cherry pick from eclair ->docs: add dashboard for screens
Dirk Dougherty [Tue, 18 May 2010 00:04:48 +0000 (17:04 -0700)]
am
6bb6348f: Doc change: cherry pick from eclair ->docs: add dashboard for screens update platform dashboard
Merge commit '
6bb6348f2a542b05b9945f28566fb876cf6aee2e' into froyo-plus-aosp
* commit '
6bb6348f2a542b05b9945f28566fb876cf6aee2e':
Doc change: cherry pick from eclair ->docs: add dashboard for screens
Xia Wang [Mon, 17 May 2010 23:26:32 +0000 (16:26 -0700)]
Merge " ConnectivityManagerTestActivity can be launched from launcher. Help to track bug
2680352. Add a resource file for string. Corrent some typos." into kraken
Mike Lockwood [Mon, 17 May 2010 21:59:39 +0000 (14:59 -0700)]
am
3e9e9696: am
eb9cbb8f: Resurrect flashlight support in obsolete IHardwareService Binder API.
Merge commit '
3e9e9696f147c8df1236c1d7aa9496124864a81c' into kraken
* commit '
3e9e9696f147c8df1236c1d7aa9496124864a81c':
Resurrect flashlight support in obsolete IHardwareService Binder API.
Mike Lockwood [Mon, 17 May 2010 21:56:53 +0000 (14:56 -0700)]
am
eb9cbb8f: Resurrect flashlight support in obsolete IHardwareService Binder API.
Merge commit '
eb9cbb8fdddf4c887004b20b504083035d57a15f' into froyo-plus-aosp
* commit '
eb9cbb8fdddf4c887004b20b504083035d57a15f':
Resurrect flashlight support in obsolete IHardwareService Binder API.
Mathias Agopian [Mon, 17 May 2010 21:49:36 +0000 (14:49 -0700)]
Merge "fix a crasher in our EGL wrapper when attrib_list is NULL in eglChooseConfig" into kraken
Mathias Agopian [Mon, 17 May 2010 21:45:43 +0000 (14:45 -0700)]
fix a crasher in our EGL wrapper when attrib_list is NULL in eglChooseConfig
the EGL specification states that this should be treated as though it was
an empty list terminated with EGL_NONE.
Change-Id: I294104370a86b5e5c34c7bcf15c5459eab464631
Kenny Root [Mon, 17 May 2010 20:53:44 +0000 (13:53 -0700)]
am
8ea405d1: am
cfa2de30: Import revised translations
Merge commit '
8ea405d196c8b536047d961801bb2b6c18a3ea2a' into kraken
* commit '
8ea405d196c8b536047d961801bb2b6c18a3ea2a':
Import revised translations
The Android Open Source Project [Mon, 17 May 2010 20:53:35 +0000 (13:53 -0700)]
am
8382068e: merge from open-source master
Merge commit '
8382068ef2d385183f090373f3b0c6026bd56a99' into kraken
* commit '
8382068ef2d385183f090373f3b0c6026bd56a99':
Updated RGB LED test cases
Jean-Baptiste Queru [Mon, 17 May 2010 20:50:32 +0000 (13:50 -0700)]
resolved conflicts for merge of
f7fb5331 to kraken
Change-Id: I61258dd7c7e52a6251c1d9499e113401ff375b20
Kenny Root [Mon, 17 May 2010 18:37:35 +0000 (11:37 -0700)]
am
cfa2de30: Import revised translations
Merge commit '
cfa2de303e58b971e334363356d29601e61d11c8' into froyo-plus-aosp
* commit '
cfa2de303e58b971e334363356d29601e61d11c8':
Import revised translations
The Android Open Source Project [Mon, 17 May 2010 17:38:00 +0000 (10:38 -0700)]
merge from open-source master
Change-Id: I139c349b80b2cecfbdc30bd697cba099740293d9
Jean-Baptiste Queru [Mon, 17 May 2010 16:12:43 +0000 (09:12 -0700)]
Merge "Updated RGB LED test cases"
The Android Open Source Project [Mon, 17 May 2010 15:56:54 +0000 (08:56 -0700)]
merge from open-source master
Change-Id: Ia0201ec7be4c112569b8775429d1c9674eb3b661
Eric Laurent [Fri, 14 May 2010 10:26:45 +0000 (03:26 -0700)]
Fix issue
2553359: Pandora does not work well with Passion deskdock / Cardock.
The problem is due to a too big difference between the buffer size used at the hardware interface and at the A2DP interface.
When no resampling occurs we don't notice problems but the timing is very tight. As soon as resampling is activated, the AudioTrack underruns.
This is because the AudioTrack buffers are not resized when moving the AudioTrack from hardware to A2DP output.
The AudioTrack buffers are calculated based on a hardware output buffer size of 3072 bytes. Which is much less than the A2DP output buffer size (10240).
The solution consists in creating new tracks with new buffers in AudioFlinger when the A2DP output is opened
instead of just transfering active tracks from hardware output mixer thread to the new A2DP output mixer thread.
To avoid synchronization issues between mixer threads and client processes, this is done by invalidating tracks
by setting a flag in their control block and having AudioTrack release the handle on this track (IAudioTrack)
and create a new IAudioTrack when this flag is detected next time obtainBuffer() or start() is executed.
AudioFlinger modifications:
- invalidate the tracks when setStreamOutput() is called
- make sure that notifications of output opening/closing and change of stream type to output mapping are sent synchronously to client process.
This is necessary so that AudioSystem has the new stream to output mapping when the AudioTrack detects the invalidate flag in the client process.
Previously their were sent when the corresponding thread loop was executed.
AudioTrack modifications:
- move frame count calculation and verification from set() to createTrack() so that is is updated every time a new IAudioTrack is created.
- detect track invalidate flag in obtainBuffer() and start() and create a new IAudioTrack.
AudioTrackShared modifications
- group all flags (out, flowControlFlag, forceReady...) into a single bit filed to save space.
Change-Id: I9ac26b6192230627d35084e1449640caaf7d56ee
Romain Guy [Sat, 15 May 2010 19:34:05 +0000 (12:34 -0700)]
Merge "Fixing indeterminate progress bar animation state."
Chung-yih Wang [Sat, 15 May 2010 06:18:31 +0000 (23:18 -0700)]
am
c7388e35: am
5f1beda1: Merge "Make the SSID field of WifiConfiguration consistent with API description." into froyo
Merge commit '
c7388e3541c9f1d64dd13fc2de49ff77d8993fa5' into kraken
* commit '
c7388e3541c9f1d64dd13fc2de49ff77d8993fa5':
Make the SSID field of WifiConfiguration consistent with API description.
Chung-yih Wang [Sat, 15 May 2010 06:16:31 +0000 (23:16 -0700)]
am
5f1beda1: Merge "Make the SSID field of WifiConfiguration consistent with API description." into froyo
Merge commit '
5f1beda18fc7709c2e61ace33607513770faf115' into froyo-plus-aosp
* commit '
5f1beda18fc7709c2e61ace33607513770faf115':
Make the SSID field of WifiConfiguration consistent with API description.
Chung-yih Wang [Sat, 15 May 2010 06:15:04 +0000 (23:15 -0700)]
Merge "Make the SSID field of WifiConfiguration consistent with API description." into froyo
Dianne Hackborn [Sat, 15 May 2010 06:13:30 +0000 (23:13 -0700)]
am
39c31bba: am
aa77de13: Fix issue #
2686193: Can\'t move apps to SD card
Merge commit '
39c31bbaf9bb07365a4b63144cdf625483851a08' into kraken
* commit '
39c31bbaf9bb07365a4b63144cdf625483851a08':
Fix issue #
2686193: Can't move apps to SD card
Dianne Hackborn [Sat, 15 May 2010 06:11:33 +0000 (23:11 -0700)]
am
aa77de13: Fix issue #
2686193: Can\'t move apps to SD card
Merge commit '
aa77de1348cbda3d5348b15734ab141cb9c7759c' into froyo-plus-aosp
* commit '
aa77de1348cbda3d5348b15734ab141cb9c7759c':
Fix issue #
2686193: Can't move apps to SD card
Jeff Hamilton [Sat, 15 May 2010 02:36:40 +0000 (19:36 -0700)]
Merge "Modified libdrm to support SuperH platform"
Dirk Dougherty [Sat, 15 May 2010 01:43:45 +0000 (18:43 -0700)]
am
c6b7a2d7: am
d1e9d590: Doc change: add sizes/sums for sdk/ndk/adt packages.
Merge commit '
c6b7a2d704b6196c2f578302af607d58b0b85e4b' into kraken
* commit '
c6b7a2d704b6196c2f578302af607d58b0b85e4b':
Doc change: add sizes/sums for sdk/ndk/adt packages.
Dirk Dougherty [Sat, 15 May 2010 01:42:11 +0000 (18:42 -0700)]
am
d1e9d590: Doc change: add sizes/sums for sdk/ndk/adt packages.
Merge commit '
d1e9d590941303c004459f3d798b26f1bf091535' into froyo-plus-aosp
* commit '
d1e9d590941303c004459f3d798b26f1bf091535':
Doc change: add sizes/sums for sdk/ndk/adt packages.
Mathias Agopian [Sat, 15 May 2010 01:35:34 +0000 (18:35 -0700)]
Merge "fix uninitialized variable in DisplayHardware" into kraken
Mathias Agopian [Sat, 15 May 2010 01:33:30 +0000 (18:33 -0700)]
fix uninitialized variable in DisplayHardware
this fixes the issue where the display is all messed-up sometimes.
Change-Id: I20be91b5166bfff0c6d353a777351842c9df8e95
Andreas Huber [Fri, 14 May 2010 23:30:29 +0000 (16:30 -0700)]
am
a5cd816c: am
eb9128f9: Fix sampleTable instantiation, this makes sure that the sample table refers to the custom datasource that caches the metadata to prevent needless seeking.
Merge commit '
a5cd816c720ed87b91a33aa5d000a0d308c74453' into kraken
* commit '
a5cd816c720ed87b91a33aa5d000a0d308c74453':
Fix sampleTable instantiation, this makes sure that the sample table refers to the custom datasource that caches the metadata to prevent needless seeking.
Andreas Huber [Fri, 14 May 2010 23:28:09 +0000 (16:28 -0700)]
am
eb9128f9: Fix sampleTable instantiation, this makes sure that the sample table refers to the custom datasource that caches the metadata to prevent needless seeking.
Merge commit '
eb9128f9b0ee660504621381fd96f82d5bf8a3fd' into froyo-plus-aosp
* commit '
eb9128f9b0ee660504621381fd96f82d5bf8a3fd':
Fix sampleTable instantiation, this makes sure that the sample table refers to the custom datasource that caches the metadata to prevent needless seeking.
Nick Kralevich [Fri, 14 May 2010 22:28:09 +0000 (15:28 -0700)]
Merge "Get rid of warnings when compiled with -Wformat-security" into kraken
The Android Open Source Project [Fri, 14 May 2010 22:12:17 +0000 (15:12 -0700)]
am
900b6157: merge from open-source master
Merge commit '
900b6157f5dee2ed7b2c73cf320b2baf293230ff' into kraken
* commit '
900b6157f5dee2ed7b2c73cf320b2baf293230ff':
Only hold a weak pointer on SurfaceComposerClients
The Android Open Source Project [Fri, 14 May 2010 22:04:52 +0000 (15:04 -0700)]
merge from open-source master
Change-Id: I0249c6d796b35af9ba08cbccd463a1f5cf779ecd
Scott Main [Fri, 14 May 2010 21:26:14 +0000 (14:26 -0700)]
am
fb580943: am
826c9f77: docs: fix broken link, reduce API info about backup and point to dev guide
Merge commit '
fb580943133d3e9ad3e342b8038726b04686f283' into kraken
* commit '
fb580943133d3e9ad3e342b8038726b04686f283':
docs: fix broken link, reduce API info about backup and point to dev guide
Scott Main [Fri, 14 May 2010 21:24:44 +0000 (14:24 -0700)]
am
826c9f77: docs: fix broken link, reduce API info about backup and point to dev guide
Merge commit '
826c9f7773188c2a7f48d5b2d1ae4612ec2bbb49' into froyo-plus-aosp
* commit '
826c9f7773188c2a7f48d5b2d1ae4612ec2bbb49':
docs: fix broken link, reduce API info about backup and point to dev guide
Dirk Dougherty [Fri, 14 May 2010 21:01:59 +0000 (14:01 -0700)]
am
0d54b806: am
60026c3a: Merge "Doc change: adjust compatibility doc." into froyo
Merge commit '
0d54b806c62cbe3ae71ce21f5d8bad78b0bee279' into kraken
* commit '
0d54b806c62cbe3ae71ce21f5d8bad78b0bee279':
Doc change: adjust compatibility doc.
Dirk Dougherty [Fri, 14 May 2010 21:00:12 +0000 (14:00 -0700)]
am
60026c3a: Merge "Doc change: adjust compatibility doc." into froyo
Merge commit '
60026c3ab0093e6d4cd464061ab9f36d4d041532' into froyo-plus-aosp
* commit '
60026c3ab0093e6d4cd464061ab9f36d4d041532':
Doc change: adjust compatibility doc.
Dirk Dougherty [Fri, 14 May 2010 20:58:12 +0000 (13:58 -0700)]
Merge "Doc change: adjust compatibility doc." into froyo
The Android Open Source Project [Fri, 14 May 2010 20:54:56 +0000 (13:54 -0700)]
am
55b7d124: merge from open-source master
Merge commit '
55b7d1243f15395a102971e8fdc57444638729ac' into kraken
* commit '
55b7d1243f15395a102971e8fdc57444638729ac':
SetLocaleByCarrier, only if its not an unknown carrier.
The Android Open Source Project [Fri, 14 May 2010 20:52:52 +0000 (13:52 -0700)]
merge from open-source master
Change-Id: I3e36061d7ba4b8a3962bf8391d663b861a4ede38
Dirk Dougherty [Fri, 14 May 2010 20:49:56 +0000 (13:49 -0700)]
am
3d52305f: am
59cfe713: Merge "Doc change: adjustments to the api changes description" into froyo
Merge commit '
3d52305faa682366eb34c30892ddd2b390940048' into kraken
* commit '
3d52305faa682366eb34c30892ddd2b390940048':
Doc change: adjustments to the api changes description
Dirk Dougherty [Fri, 14 May 2010 20:48:04 +0000 (13:48 -0700)]
am
59cfe713: Merge "Doc change: adjustments to the api changes description" into froyo
Merge commit '
59cfe7137ca411bdbb5ffcdf418eecc55d65d09e' into froyo-plus-aosp
* commit '
59cfe7137ca411bdbb5ffcdf418eecc55d65d09e':
Doc change: adjustments to the api changes description
Dirk Dougherty [Fri, 14 May 2010 20:47:07 +0000 (13:47 -0700)]
am
cae9cfee: am
bba70cdb: Merge "Doc change: add note about future instruction set support." into froyo
Merge commit '
cae9cfeed7b0895189e08a4fadf63c917b1aec7b' into kraken
* commit '
cae9cfeed7b0895189e08a4fadf63c917b1aec7b':
Doc change: add note about future instruction set support.
Dirk Dougherty [Fri, 14 May 2010 20:46:42 +0000 (13:46 -0700)]
Merge "Doc change: adjustments to the api changes description" into froyo
Dirk Dougherty [Fri, 14 May 2010 20:45:17 +0000 (13:45 -0700)]
am
bba70cdb: Merge "Doc change: add note about future instruction set support." into froyo
Merge commit '
bba70cdba284c3d76cab9843e44097d664882938' into froyo-plus-aosp
* commit '
bba70cdba284c3d76cab9843e44097d664882938':
Doc change: add note about future instruction set support.
Dirk Dougherty [Fri, 14 May 2010 20:43:19 +0000 (13:43 -0700)]
Merge "Doc change: add note about future instruction set support." into froyo
Dirk Dougherty [Fri, 14 May 2010 20:41:46 +0000 (13:41 -0700)]
am
bf4cecd2: am
89969d4c: Merge "Doc change: documentation for library projects in sdk." into froyo
Merge commit '
bf4cecd2822ff74c8c246d2595a836b5f1130ad8' into kraken
* commit '
bf4cecd2822ff74c8c246d2595a836b5f1130ad8':
Doc change: documentation for library projects in sdk.
Dirk Dougherty [Fri, 14 May 2010 20:40:19 +0000 (13:40 -0700)]
am
89969d4c: Merge "Doc change: documentation for library projects in sdk." into froyo
Merge commit '
89969d4cdaf7abbbf6d3fce86c274e7b79113e8d' into froyo-plus-aosp
* commit '
89969d4cdaf7abbbf6d3fce86c274e7b79113e8d':
Doc change: documentation for library projects in sdk.
Jean-Baptiste Queru [Fri, 14 May 2010 20:39:48 +0000 (13:39 -0700)]
Merge "Only hold a weak pointer on SurfaceComposerClients"
Dirk Dougherty [Fri, 14 May 2010 20:38:20 +0000 (13:38 -0700)]
Merge "Doc change: documentation for library projects in sdk." into froyo
James Dong [Fri, 14 May 2010 19:19:17 +0000 (12:19 -0700)]
Merge "Detect and handle premature termination of a recording session" into kraken
Nick Kralevich [Fri, 14 May 2010 19:07:05 +0000 (12:07 -0700)]
Merge "Forgot to fix one -Wformat-security in my previous change. Fixed." into kraken
Chih-Chung Chang [Fri, 14 May 2010 19:05:06 +0000 (12:05 -0700)]
Merge "Fix deadlock if the last reference of ICameraClient is removed in ICamera::connect()" into kraken
Scott Main [Fri, 14 May 2010 18:56:14 +0000 (11:56 -0700)]
am
6d8e4fd8: am
b83a283a: docs: add dev guide for backup
Merge commit '
6d8e4fd83bb7f4eabc942dd17fa229cf9baf5fcf' into kraken
* commit '
6d8e4fd83bb7f4eabc942dd17fa229cf9baf5fcf':
docs: add dev guide for backup
Scott Main [Fri, 14 May 2010 18:53:44 +0000 (11:53 -0700)]
am
b83a283a: docs: add dev guide for backup
Merge commit '
b83a283ac178ab0a72f1d811189d79b26097835e' into froyo-plus-aosp
* commit '
b83a283ac178ab0a72f1d811189d79b26097835e':
docs: add dev guide for backup
Ray Chen [Fri, 14 May 2010 18:48:45 +0000 (11:48 -0700)]
Merge "Fix issue
2622023 Clean up all hardcoded '/sdcard' in camera related codes." into kraken
Jean-Baptiste Queru [Fri, 14 May 2010 18:39:06 +0000 (11:39 -0700)]
Merge "SetLocaleByCarrier, only if its not an unknown carrier."
Nick Kralevich [Fri, 14 May 2010 17:29:13 +0000 (10:29 -0700)]
Forgot to fix one -Wformat-security in my previous change. Fixed.
Change-Id: Ice7459b30e1d7dbfe400b68d27ebc04fcca78bae
The Android Open Source Project [Fri, 14 May 2010 16:46:11 +0000 (09:46 -0700)]
am
1d628c5d: merge from open-source master
Merge commit '
1d628c5d3dd7998b29c339292a2dc391015d0782' into kraken
* commit '
1d628c5d3dd7998b29c339292a2dc391015d0782':
Accept media files by file extension in case insensitive manner.
The Android Open Source Project [Fri, 14 May 2010 16:44:36 +0000 (09:44 -0700)]
merge from open-source master
Change-Id: I934cf85c4673f9ca3a9549c2074907ad572310f4
Eric Laurent [Fri, 14 May 2010 16:39:12 +0000 (09:39 -0700)]
Merge "AudioFlinger: rename variables to clarify reference to track channel count or channel mask" into kraken
Nick Kralevich [Fri, 14 May 2010 16:32:45 +0000 (09:32 -0700)]
Merge "Remove libdrm2. This code appears to be unused." into kraken
The Android Open Source Project [Fri, 14 May 2010 16:15:41 +0000 (09:15 -0700)]
am
9167ba50: merge from open-source master
Merge commit '
9167ba50e4d7e08e02119d9c4a0f0392296cc3f1' into kraken
* commit '
9167ba50e4d7e08e02119d9c4a0f0392296cc3f1':
Corrected debug message in WindowManager
Put the wifi status icon in the right place.
The Android Open Source Project [Fri, 14 May 2010 16:11:31 +0000 (09:11 -0700)]
merge from open-source master
Change-Id: I57f108d2b3415eddb0b20a4a9dec4c44285de226
Nick Kralevich [Thu, 13 May 2010 22:09:03 +0000 (15:09 -0700)]
Get rid of warnings when compiled with -Wformat-security
Change-Id: Ibd814d894ff0eba26b01932b9865098b7bb26f95
Jean-Baptiste Queru [Fri, 14 May 2010 16:06:43 +0000 (09:06 -0700)]
Merge "Accept media files by file extension in case insensitive manner."
Eric Laurent [Fri, 14 May 2010 12:45:46 +0000 (05:45 -0700)]
AudioFlinger: rename variables to clarify reference to track channel count or channel mask
Some variables and structure members should be renamed to reflect the fact that they contain the
number of channels in a track (channel count) or the actual channels used by a track (channel mask).
Especially member "channels" of track control block (struct audio_track_cblk_t) is actually the
number of channels (channels count).
Change-Id: I220c8dede9fc00c8a5693389e790073b6ed307b8
Dirk Dougherty [Fri, 14 May 2010 04:34:31 +0000 (21:34 -0700)]
am
d48e0382: am
fb473bb6: Merge "Doc change: adjustments for ndk feature description" into froyo
Merge commit '
d48e0382c3db1827ccb79fe912d271d426dd46ad' into kraken
* commit '
d48e0382c3db1827ccb79fe912d271d426dd46ad':
Doc change: adjustments for ndk feature description
Dirk Dougherty [Fri, 14 May 2010 04:32:21 +0000 (21:32 -0700)]
am
fb473bb6: Merge "Doc change: adjustments for ndk feature description" into froyo
Merge commit '
fb473bb6118f6b82fdeda443b4fdc4ce31d3ed60' into froyo-plus-aosp
* commit '
fb473bb6118f6b82fdeda443b4fdc4ce31d3ed60':
Doc change: adjustments for ndk feature description
Dirk Dougherty [Fri, 14 May 2010 04:31:10 +0000 (21:31 -0700)]
Merge "Doc change: adjustments for ndk feature description" into froyo
Dirk Dougherty [Fri, 14 May 2010 04:28:34 +0000 (21:28 -0700)]
am
d317edab: am
a0711e7b: Doc change: Add compatibility article.
Merge commit '
d317edabe158312981eb73355f77c36566d89627' into kraken
* commit '
d317edabe158312981eb73355f77c36566d89627':
Doc change: Add compatibility article.
Dirk Dougherty [Fri, 14 May 2010 04:26:22 +0000 (21:26 -0700)]
am
a0711e7b: Doc change: Add compatibility article.
Merge commit '
a0711e7b3995f4ae3d8b116030c6b3ed13ad2f99' into froyo-plus-aosp
* commit '
a0711e7b3995f4ae3d8b116030c6b3ed13ad2f99':
Doc change: Add compatibility article.
James Dong [Thu, 13 May 2010 23:40:19 +0000 (16:40 -0700)]
Merge "Remove dummy surface in CameraSource" into kraken
Joe Onorato [Thu, 13 May 2010 23:33:22 +0000 (16:33 -0700)]
Merge "Put the wifi status icon in the right place."
Suchi Amalapurapu [Thu, 13 May 2010 23:05:54 +0000 (16:05 -0700)]
am
b63ea5f7: am
c928a11e: Merge "Fix
2672155 Check the code path when enabling disabling packages." into froyo
Merge commit '
b63ea5f784b7862a7ab28e0134f6da47f6275810' into kraken
* commit '
b63ea5f784b7862a7ab28e0134f6da47f6275810':
Fix
2672155
Suchi Amalapurapu [Thu, 13 May 2010 23:04:24 +0000 (16:04 -0700)]
am
c928a11e: Merge "Fix
2672155 Check the code path when enabling disabling packages." into froyo
Merge commit '
c928a11e34678296511d5ea34582292be7368618' into froyo-plus-aosp
* commit '
c928a11e34678296511d5ea34582292be7368618':
Fix
2672155
Suchi Amalapurapu [Thu, 13 May 2010 23:02:20 +0000 (16:02 -0700)]
Merge "Fix
2672155 Check the code path when enabling disabling packages." into froyo
Nick Kralevich [Thu, 13 May 2010 22:35:48 +0000 (15:35 -0700)]
Merge "Get rid of warnings when compiled with -Wformat-security" into kraken
The Android Open Source Project [Thu, 13 May 2010 21:56:02 +0000 (14:56 -0700)]
am
b1110149: merge from open-source master
Merge commit '
b1110149cccc3b99e59ead34ca46e5ac026f6db9' into kraken
* commit '
b1110149cccc3b99e59ead34ca46e5ac026f6db9':
Use integer for loop counter instead of float
New test in FrameworkTest for the VelocityTracker class
Preserve '+' in phone numbers imported from SIM.
The Android Open Source Project [Thu, 13 May 2010 21:50:16 +0000 (14:50 -0700)]
merge from open-source master
Change-Id: I88a580162b34a80d1e3e7987b7a301c253afa0e8
Mike Lockwood [Thu, 13 May 2010 21:06:25 +0000 (14:06 -0700)]
am
a3d5549c: am
098e58da: Use SystemClock.elapsedRealtime in ShutdownThread timeout logic
Merge commit '
a3d5549c802bc4fbf1e1ca05bc3552db17212036' into kraken
* commit '
a3d5549c802bc4fbf1e1ca05bc3552db17212036':
Use SystemClock.elapsedRealtime in ShutdownThread timeout logic
Mike Lockwood [Thu, 13 May 2010 21:04:30 +0000 (14:04 -0700)]
am
098e58da: Use SystemClock.elapsedRealtime in ShutdownThread timeout logic
Merge commit '
098e58da93f304d7d7791f193c6237870b94989d' into froyo-plus-aosp
* commit '
098e58da93f304d7d7791f193c6237870b94989d':
Use SystemClock.elapsedRealtime in ShutdownThread timeout logic
Dianne Hackborn [Thu, 13 May 2010 20:25:16 +0000 (13:25 -0700)]
Merge "Corrected debug message in WindowManager"
Jaikumar Ganesh [Thu, 13 May 2010 19:20:06 +0000 (12:20 -0700)]
Merge "Add FLAG_RERAIN_PHONE_NUMBER_FORMATTING." into kraken
Jean-Baptiste Queru [Thu, 13 May 2010 18:39:51 +0000 (11:39 -0700)]
Merge "New test in FrameworkTest for the VelocityTracker class"
Andreas Huber [Thu, 13 May 2010 18:18:24 +0000 (11:18 -0700)]
am
28fadef2: am
3c78a1b5: Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config.
Merge commit '
28fadef2ede2d74e9526266e779553bbd1dc66f4' into kraken
* commit '
28fadef2ede2d74e9526266e779553bbd1dc66f4':
Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config.
Andreas Huber [Thu, 13 May 2010 18:16:43 +0000 (11:16 -0700)]
am
3c78a1b5: Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config.
Merge commit '
3c78a1b58957e31d2991fb6a609abecbb1987b3b' into froyo-plus-aosp
* commit '
3c78a1b58957e31d2991fb6a609abecbb1987b3b':
Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config.
Jean-Baptiste Queru [Thu, 13 May 2010 18:06:28 +0000 (11:06 -0700)]
Merge "Preserve '+' in phone numbers imported from SIM."
The Android Open Source Project [Thu, 13 May 2010 16:53:16 +0000 (09:53 -0700)]
am
1a3b3d48: merge from open-source master
Merge commit '
1a3b3d48413d9134738c9b457292fb2b71a5dfe4' into kraken
* commit '
1a3b3d48413d9134738c9b457292fb2b71a5dfe4':
Add some documentation about the thread safety of Cursor and some of the SQLite* classes.