summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 4547e528: merge from open-source masterThe Android Open Source Project2010-05-182-5/+2
|\ | | | | | | | | | | | | Merge commit '4547e5284e79192373f3a6bb6c452501171bc1d6' into kraken * commit '4547e5284e79192373f3a6bb6c452501171bc1d6': Removed Calls to deprecated APIs and unused Imports
| * merge from open-source masterThe Android Open Source Project2010-05-182-5/+2
| |\ | | | | | | | | | Change-Id: I3607454a9257701855354c12ef1f36841c889aea
| | * Removed Calls to deprecated APIs and unused ImportsChristian Mehlmauer2010-05-174-11/+4
| | | | | | | | | | | | Change-Id: Ib26783ca1d6c345cc91aa3ab5b9654f5316c78a0
* | | am 74e151c5: am 5f1d1002: Merge "docs: fix markup error" into froyoScott Main2010-05-181-1/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '74e151c54c31cf7324771fcabc06e9fbfe1118ca' into kraken * commit '74e151c54c31cf7324771fcabc06e9fbfe1118ca': docs: fix markup error
| * | am 5f1d1002: Merge "docs: fix markup error" into froyoScott Main2010-05-181-1/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '5f1d100298dfafbd996b6deff457e6d1de4008a0' into froyo-plus-aosp * commit '5f1d100298dfafbd996b6deff457e6d1de4008a0': docs: fix markup error
| | * \ Merge "docs: fix markup error" into froyoScott Main2010-05-181-1/+2
| | |\ \
| | | * | docs: fix markup errorScott Main2010-05-181-1/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I59a42f47483d76b6a3220b1d88e9d6bd96f83daf
* | | | | Merge "add a few tests to SharedBufferStackTest" into krakenMathias Agopian2010-05-171-4/+14
|\ \ \ \ \
| * | | | | add a few tests to SharedBufferStackTestMathias Agopian2010-05-171-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1c46c07aa1483aee4d4ebd8745638a2c462cc1b3
* | | | | | Merge "improve SharedBufferStack test" into krakenMathias Agopian2010-05-171-15/+43
|\ \ \ \ \ \ | |/ / / / /
| * | | | | improve SharedBufferStack testMathias Agopian2010-05-171-15/+43
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I32683bfe0916918757280db89113595867acd5a7
* | | | | | Merge "fix a bug where queueBuffer() would fail after the SharedbufferStack ↵Mathias Agopian2010-05-171-2/+17
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | is resized" into kraken
| * | | | | fix a bug where queueBuffer() would fail after the SharedbufferStack is resizedMathias Agopian2010-05-171-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I12bf13a62018ce1349bab7be0b0cad7fad13fee8
* | | | | | Store the list of source directories for the SDK.Joe Onorato2010-05-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3e8425c8eb7c808b60ec764ff81bcbb7aec9684c
* | | | | | am fbb285e6: am e64256d6: Merge "docs: revise webview description and add ↵Scott Main2010-05-171-20/+103
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | am e64256d6: Merge "docs: revise webview description and add info for ↵Scott Main2010-05-171-20/+103
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | Merge "docs: revise webview description and add info for targeting screen ↵Scott Main2010-05-171-20/+103
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | densities" into froyo
| | | * | | docs: revise webview description and add info for targeting screen densitiesScott Main2010-05-171-20/+103
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib0293b497adef23330ee3f5f71904ad78a55a3a3
* | | | | | am b2fa79e3: am 6750bb7f: Doc change: add link to source.android.comDirk Dougherty2010-05-171-1/+12
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b2fa79e3723b448114181fef983deaae97b44161' into kraken * commit 'b2fa79e3723b448114181fef983deaae97b44161': Doc change: add link to source.android.com
| * | | | | am 6750bb7f: Doc change: add link to source.android.comDirk Dougherty2010-05-171-1/+12
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '6750bb7f838b15ef25544d7aa66b17119fcd7227' into froyo-plus-aosp * commit '6750bb7f838b15ef25544d7aa66b17119fcd7227': Doc change: add link to source.android.com
| | * | | | Doc change: add link to source.android.comDirk Dougherty2010-05-171-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia15c621ddf9ab380d7d2dcf3d8c92d527e6a69f0
* | | | | | Merge "fix some bugs in SharedBufferStack::resize" into krakenMathias Agopian2010-05-172-6/+9
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | fix some bugs in SharedBufferStack::resizeMathias Agopian2010-05-172-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added buffers should now be labeled properly. Change-Id: I28aa753fbe89ab89134e7753575319478934c7fa
* | | | | | am 429e8e3a: am 6bb6348f: Doc change: cherry pick from eclair ->docs: add ↵Dirk Dougherty2010-05-173-30/+104
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dashboard for screens update platform dashboard Merge commit '429e8e3a7333a162de352b158c15c61a7ab65807' into kraken * commit '429e8e3a7333a162de352b158c15c61a7ab65807': Doc change: cherry pick from eclair ->docs: add dashboard for screens
| * | | | | am 6bb6348f: Doc change: cherry pick from eclair ->docs: add dashboard for ↵Dirk Dougherty2010-05-173-30/+104
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | screens update platform dashboard Merge commit '6bb6348f2a542b05b9945f28566fb876cf6aee2e' into froyo-plus-aosp * commit '6bb6348f2a542b05b9945f28566fb876cf6aee2e': Doc change: cherry pick from eclair ->docs: add dashboard for screens
| | * | | | Doc change: cherry pick from eclair ->docs: add dashboard for screensDirk Dougherty2010-05-173-30/+104
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update platform dashboard Conflicts: docs/html/resources/dashboard/platform-versions.jd Change-Id: I6d812085c96eb61e4f6d6e76af714292fa0d38b1
* | | | | Merge " ConnectivityManagerTestActivity can be launched from launcher. Help ↵Xia Wang2010-05-172-4/+10
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | to track bug 2680352. Add a resource file for string. Corrent some typos." into kraken
| * | | | ConnectivityManagerTestActivity can be launched from launcher.Xia Wang2010-05-172-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Help to track bug 2680352. Add a resource file for string. Corrent some typos. Change-Id: I42fefe49c360168ec807ed82dc220ab68681d14e
* | | | | am 3e9e9696: am eb9cbb8f: Resurrect flashlight support in obsolete ↵Mike Lockwood2010-05-173-1/+77
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IHardwareService Binder API. Merge commit '3e9e9696f147c8df1236c1d7aa9496124864a81c' into kraken * commit '3e9e9696f147c8df1236c1d7aa9496124864a81c': Resurrect flashlight support in obsolete IHardwareService Binder API.
| * | | | am eb9cbb8f: Resurrect flashlight support in obsolete IHardwareService ↵Mike Lockwood2010-05-173-1/+77
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Binder API. Merge commit 'eb9cbb8fdddf4c887004b20b504083035d57a15f' into froyo-plus-aosp * commit 'eb9cbb8fdddf4c887004b20b504083035d57a15f': Resurrect flashlight support in obsolete IHardwareService Binder API.
| | * | | Resurrect flashlight support in obsolete IHardwareService Binder API.Mike Lockwood2010-05-173-1/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to avoid flashlight apps that had been using reflection to access this API after this class was removed after eclair. Change-Id: I26ed929abad93345468eb33d4a15977a31ebea7e Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | Merge "fix a crasher in our EGL wrapper when attrib_list is NULL in ↵Mathias Agopian2010-05-172-6/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | eglChooseConfig" into kraken
| * | | | | fix a crasher in our EGL wrapper when attrib_list is NULL in eglChooseConfigMathias Agopian2010-05-172-6/+13
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | the EGL specification states that this should be treated as though it was an empty list terminated with EGL_NONE. Change-Id: I294104370a86b5e5c34c7bcf15c5459eab464631
* | | | | am 8ea405d1: am cfa2de30: Import revised translationsKenny Root2010-05-1720-52/+52
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Merge commit '8ea405d196c8b536047d961801bb2b6c18a3ea2a' into kraken * commit '8ea405d196c8b536047d961801bb2b6c18a3ea2a': Import revised translations
| * | | | am cfa2de30: Import revised translationsKenny Root2010-05-1720-52/+52
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | Merge commit 'cfa2de303e58b971e334363356d29601e61d11c8' into froyo-plus-aosp * commit 'cfa2de303e58b971e334363356d29601e61d11c8': Import revised translations
| | * | | Import revised translationsKenny Root2010-05-1720-52/+52
| | | | | | | | | | | | | | | | | | | | Change-Id: Id6bd3011874ff8544a030473cc994f9a0201c97d
* | | | | am 8382068e: merge from open-source masterThe Android Open Source Project2010-05-171-2/+20
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '8382068ef2d385183f090373f3b0c6026bd56a99' into kraken * commit '8382068ef2d385183f090373f3b0c6026bd56a99': Updated RGB LED test cases
| * | | | merge from open-source masterThe Android Open Source Project2010-05-171-2/+20
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | Change-Id: I139c349b80b2cecfbdc30bd697cba099740293d9
| | * | | Merge "Updated RGB LED test cases"Jean-Baptiste Queru2010-05-171-2/+20
| | |\ \ \
| | | * | | Updated RGB LED test casesMattias Östergren2010-03-051-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test cases for turning on the RGB LED with persistent light was corrected. The color for blinking was updated to blue. And finally an option for turning off the lights was added.
* | | | | | resolved conflicts for merge of f7fb5331 to krakenJean-Baptiste Queru2010-05-171-0/+16
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | Change-Id: I61258dd7c7e52a6251c1d9499e113401ff375b20
| * | | | merge from open-source masterThe Android Open Source Project2010-05-173-1/+21
| |\ \ \ \ | | |/ / / | | | | | | | | | | Change-Id: Ia0201ec7be4c112569b8775429d1c9674eb3b661
| | * | | Merge "Fixing indeterminate progress bar animation state."Romain Guy2010-05-151-0/+16
| | |\ \ \
| | | * | | Fixing indeterminate progress bar animation state.David Sobreira Marques2010-05-151-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When showing a progress bar instance more than once it will not animate after the first time. Change-Id: I5104c551d561755005e533f2ab5257454567bf71 Signed-off-by: David Sobreira Marques <dpsmarques@gmail.com>
| | * | | | Merge "Modified libdrm to support SuperH platform"Jeff Hamilton2010-05-142-1/+5
| | |\ \ \ \
| | | * | | | Modified libdrm to support SuperH platformShin-ichiro KAWASAKI2009-07-032-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Added USTL_ANDROID_SH defination while build on SuperH platform
* | | | | | | Fix issue 2553359: Pandora does not work well with Passion deskdock / Cardock.Eric Laurent2010-05-177-186/+181
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | am c7388e35: am 5f1beda1: Merge "Make the SSID field of WifiConfiguration ↵Chung-yih Wang2010-05-141-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | consistent with API description." into froyo Merge commit 'c7388e3541c9f1d64dd13fc2de49ff77d8993fa5' into kraken * commit 'c7388e3541c9f1d64dd13fc2de49ff77d8993fa5': Make the SSID field of WifiConfiguration consistent with API description.
| * | | | | | am 5f1beda1: Merge "Make the SSID field of WifiConfiguration consistent with ↵Chung-yih Wang2010-05-141-2/+2
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API description." into froyo Merge commit '5f1beda18fc7709c2e61ace33607513770faf115' into froyo-plus-aosp * commit '5f1beda18fc7709c2e61ace33607513770faf115': Make the SSID field of WifiConfiguration consistent with API description.
| | * | | | | Merge "Make the SSID field of WifiConfiguration consistent with API ↵Chung-yih Wang2010-05-141-2/+2
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | description." into froyo