OSDN Git Service
Scott Main [Thu, 20 May 2010 01:08:34 +0000 (18:08 -0700)]
am
fa6ee245: am
68728cb3: docs: add 2.2 platform highlights
Merge commit '
fa6ee245c7010101d87194b00f34ea3448053f28' into kraken
* commit '
fa6ee245c7010101d87194b00f34ea3448053f28':
docs: add 2.2 platform highlights
Scott Main [Thu, 20 May 2010 01:06:51 +0000 (18:06 -0700)]
am
68728cb3: docs: add 2.2 platform highlights
Merge commit '
68728cb3b44aba16abc298a37f6110ed00a781dd' into froyo-plus-aosp
* commit '
68728cb3b44aba16abc298a37f6110ed00a781dd':
docs: add 2.2 platform highlights
Mathias Agopian [Wed, 19 May 2010 22:11:00 +0000 (15:11 -0700)]
added RWLock C++ wrapper
Change-Id: Ia736bf7f6e2c49915a9ab5669551cf89dafa7961
James Dong [Wed, 19 May 2010 20:14:24 +0000 (13:14 -0700)]
Merge "Initial software encoder checkins" into kraken
Wink Saville [Wed, 19 May 2010 20:05:55 +0000 (13:05 -0700)]
Merge "Update docs, add HANDLED, NOT_HANDLED and getCurrentMessage." into kraken
Scott Main [Wed, 19 May 2010 19:11:03 +0000 (12:11 -0700)]
am
8bf77456: am
8d0e37f5: Merge "docs: revise platform intro" into froyo
Merge commit '
8bf77456cec82cbda3393a4e48f265af1670e795' into kraken
* commit '
8bf77456cec82cbda3393a4e48f265af1670e795':
docs: revise platform intro
Scott Main [Wed, 19 May 2010 19:09:04 +0000 (12:09 -0700)]
am
8d0e37f5: Merge "docs: revise platform intro" into froyo
Merge commit '
8d0e37f5b142623b41b78ce5d19b4b650d53eb7f' into froyo-plus-aosp
* commit '
8d0e37f5b142623b41b78ce5d19b4b650d53eb7f':
docs: revise platform intro
Scott Main [Wed, 19 May 2010 19:05:52 +0000 (12:05 -0700)]
Merge "docs: revise platform intro" into froyo
The Android Open Source Project [Wed, 19 May 2010 16:43:20 +0000 (09:43 -0700)]
am
ee1cdd0e: merge from open-source master
Merge commit '
ee1cdd0e605e9154b3b61d4bf7dd5aad9cab88ed' into kraken
* commit '
ee1cdd0e605e9154b3b61d4bf7dd5aad9cab88ed':
Don't allow invalid Uris to be added as observers.
The Android Open Source Project [Wed, 19 May 2010 16:37:21 +0000 (09:37 -0700)]
am
2b544c9f: merge from open-source master
Merge commit '
2b544c9f0ea139d052664be0be465c2315707081' into kraken
* commit '
2b544c9f0ea139d052664be0be465c2315707081':
Fix isssue
2548710: Native AudioTrack resources never freed.
The Android Open Source Project [Wed, 19 May 2010 16:36:55 +0000 (09:36 -0700)]
merge from open-source master
Change-Id: I1612bf92bf47eb88299ed0e627e6662b23adc35a
The Android Open Source Project [Wed, 19 May 2010 16:32:44 +0000 (09:32 -0700)]
merge from open-source master
Change-Id: Ief641c7d7a7e82e90bba630c778582a0f9bd938b
The Android Open Source Project [Wed, 19 May 2010 16:22:21 +0000 (09:22 -0700)]
am
2dc7c6c4: merge from open-source master
Merge commit '
2dc7c6c4153380fc64b99d37d763d3f0d1cac04d' into kraken
* commit '
2dc7c6c4153380fc64b99d37d763d3f0d1cac04d':
Add and document .nomedia constant for MediaStore (Issue 6365)
The Android Open Source Project [Wed, 19 May 2010 16:20:22 +0000 (09:20 -0700)]
merge from open-source master
Change-Id: I94b3aacb3478b1d9e0751c02bb301d5f9a2cf05c
Romain Guy [Wed, 19 May 2010 16:03:57 +0000 (09:03 -0700)]
Merge "Don't allow invalid Uris to be added as observers."
The Android Open Source Project [Wed, 19 May 2010 15:41:26 +0000 (08:41 -0700)]
am
faf9a783: merge from open-source master
Merge commit '
faf9a78363b0c773b95c9b43263d788aee313054' into kraken
* commit '
faf9a78363b0c773b95c9b43263d788aee313054':
Text disappears when selecting text in text editor.
The Android Open Source Project [Wed, 19 May 2010 15:39:13 +0000 (08:39 -0700)]
merge from open-source master
Change-Id: I970684d917ea2024871b45abe532c52bb45673c6
Jean-Baptiste Queru [Wed, 19 May 2010 15:35:21 +0000 (08:35 -0700)]
Merge "Fix isssue
2548710: Native AudioTrack resources never freed."
The Android Open Source Project [Wed, 19 May 2010 15:33:27 +0000 (08:33 -0700)]
am
d6c0bb0f: merge from open-source master
Merge commit '
d6c0bb0f0f3827f1c336db20ac9dc0eb90cd46fa' into kraken
* commit '
d6c0bb0f0f3827f1c336db20ac9dc0eb90cd46fa':
Removed Calls to deprecated APIs
The Android Open Source Project [Wed, 19 May 2010 15:28:32 +0000 (08:28 -0700)]
merge from open-source master
Change-Id: I0598edad283a177a5ddcc30e20d2284503e6038e
The Android Open Source Project [Wed, 19 May 2010 15:21:54 +0000 (08:21 -0700)]
am
aa2fe148: merge from open-source master
Merge commit '
aa2fe148496858e17d0ffd2b8d5d29b89d400934' into kraken
* commit '
aa2fe148496858e17d0ffd2b8d5d29b89d400934':
Improved error handling when font loading fails.
The Android Open Source Project [Wed, 19 May 2010 15:15:54 +0000 (08:15 -0700)]
merge from open-source master
Change-Id: I34e8339dcf1bf658703d0d2f9656ceb66594af22
Romain Guy [Wed, 19 May 2010 07:03:34 +0000 (00:03 -0700)]
Merge "Add and document .nomedia constant for MediaStore (Issue 6365)"
Romain Guy [Wed, 19 May 2010 07:01:55 +0000 (00:01 -0700)]
Merge "Text disappears when selecting text in text editor."
Romain Guy [Wed, 19 May 2010 07:01:02 +0000 (00:01 -0700)]
Merge "Removed Calls to deprecated APIs"
Romain Guy [Wed, 19 May 2010 06:51:16 +0000 (23:51 -0700)]
Merge "Improved error handling when font loading fails."
Guang Zhu [Wed, 19 May 2010 01:33:35 +0000 (18:33 -0700)]
Merge "disable emma instrumentation for framework, ext and services (DO NOT MERGE)" into kraken
Guang Zhu [Wed, 19 May 2010 01:33:30 +0000 (18:33 -0700)]
Merge "add execution permission to "input" script (DO NOT MERGE)" into kraken
Suchi Amalapurapu [Tue, 18 May 2010 21:55:48 +0000 (14:55 -0700)]
am
7361b741: am
4a0823e5: Merge "Uncomment a test that was marked as STOPSHIP Add MediumTest tag" into froyo
Merge commit '
7361b7410f2427022cc8917b00553dc26107cded' into kraken
* commit '
7361b7410f2427022cc8917b00553dc26107cded':
Uncomment a test that was marked as STOPSHIP
Jaikumar Ganesh [Tue, 18 May 2010 21:53:39 +0000 (14:53 -0700)]
am
ea6f6755: am
ef95aceb: Merge "Removing STOPSHIP logs." into froyo
Merge commit '
ea6f6755ce15133238938bd9626b69e5f655a49c' into kraken
* commit '
ea6f6755ce15133238938bd9626b69e5f655a49c':
Removing STOPSHIP logs.
Suchi Amalapurapu [Tue, 18 May 2010 21:53:37 +0000 (14:53 -0700)]
am
4a0823e5: Merge "Uncomment a test that was marked as STOPSHIP Add MediumTest tag" into froyo
Merge commit '
4a0823e5486f16b10762076d629f2f7e4d5da476' into froyo-plus-aosp
* commit '
4a0823e5486f16b10762076d629f2f7e4d5da476':
Uncomment a test that was marked as STOPSHIP
Suchi Amalapurapu [Tue, 18 May 2010 21:51:55 +0000 (14:51 -0700)]
Merge "Uncomment a test that was marked as STOPSHIP Add MediumTest tag" into froyo
Jaikumar Ganesh [Tue, 18 May 2010 21:51:40 +0000 (14:51 -0700)]
am
ef95aceb: Merge "Removing STOPSHIP logs." into froyo
Merge commit '
ef95acebdc44a7cf2990c4302850fcb112b695d2' into froyo-plus-aosp
* commit '
ef95acebdc44a7cf2990c4302850fcb112b695d2':
Removing STOPSHIP logs.
Jaikumar Ganesh [Tue, 18 May 2010 21:48:05 +0000 (14:48 -0700)]
Merge "Removing STOPSHIP logs." into froyo
Eric Laurent [Wed, 31 Mar 2010 19:21:17 +0000 (12:21 -0700)]
Fix isssue
2548710: Native AudioTrack resources never freed.
The problem is a bug in AudioFlinger::MixerThread::prepareTracks_l() that makes that even if the TrackHandle
is destroyed, the corresponding Track will remain active as long as frames are ready for mixing.
If the track uses shared memory (static mode) and the sound is looped, this track will play for ever.
The fix consists in removing the track from active list immediately if the track is terminated.
Change-Id: Iaa78a91e78d27f5c982218cc55e81702f1610ab2
Suchi Amalapurapu [Tue, 18 May 2010 20:17:58 +0000 (13:17 -0700)]
am
aa4db173: am
9a212adc: Fix
2641875 Initialize the cache path only if the container exists. This did exist before but was somehow removed. Fix a known test failure as well.
Merge commit '
aa4db173a2465d74ea35cc7f736f6b2a5b01f72c' into kraken
* commit '
aa4db173a2465d74ea35cc7f736f6b2a5b01f72c':
Fix
2641875
Suchi Amalapurapu [Tue, 18 May 2010 20:16:13 +0000 (13:16 -0700)]
am
9a212adc: Fix
2641875 Initialize the cache path only if the container exists. This did exist before but was somehow removed. Fix a known test failure as well.
Merge commit '
9a212adcffbc4b32d51f512889b33ba584647aa9' into froyo-plus-aosp
* commit '
9a212adcffbc4b32d51f512889b33ba584647aa9':
Fix
2641875
The Android Open Source Project [Tue, 18 May 2010 19:49:01 +0000 (12:49 -0700)]
am
3aecdb9d: merge from open-source master
Merge commit '
3aecdb9d7e92b1a91860600feefb5c0062b652cf' into kraken
* commit '
3aecdb9d7e92b1a91860600feefb5c0062b652cf':
fix build
Fix some typos and other cosmetic cleanups in telephony framework.
The Android Open Source Project [Tue, 18 May 2010 19:47:02 +0000 (12:47 -0700)]
merge from open-source master
Change-Id: Ib711450566694550d9cb9ba01c25599010d2e5e4
Dianne Hackborn [Tue, 18 May 2010 19:21:26 +0000 (12:21 -0700)]
Merge "Add new API to take over a window's Surface." into kraken
The Android Open Source Project [Tue, 18 May 2010 18:17:01 +0000 (11:17 -0700)]
am
5ccb8b8c: merge from open-source master
Merge commit '
5ccb8b8c4d6eabcc984559ef9e71efdbb3de00d3' into kraken
* commit '
5ccb8b8c4d6eabcc984559ef9e71efdbb3de00d3':
Fix updating and deleting FDN entries with an empty alpha identifier.
Abort FDN delete when number is empty (instead of name)
The Android Open Source Project [Tue, 18 May 2010 18:08:12 +0000 (11:08 -0700)]
merge from open-source master
Change-Id: Ib90da5365c873e542d79f036c32ec9b178cd8da0
Jean-Baptiste Queru [Tue, 18 May 2010 17:34:42 +0000 (10:34 -0700)]
Merge "Fix some typos and other cosmetic cleanups in telephony framework."
Jean-Baptiste Queru [Tue, 18 May 2010 17:14:14 +0000 (10:14 -0700)]
Merge "Abort FDN delete when number is empty (instead of name)"
The Android Open Source Project [Tue, 18 May 2010 16:21:28 +0000 (09:21 -0700)]
am
4547e528: merge from open-source master
Merge commit '
4547e5284e79192373f3a6bb6c452501171bc1d6' into kraken
* commit '
4547e5284e79192373f3a6bb6c452501171bc1d6':
Removed Calls to deprecated APIs and unused Imports
The Android Open Source Project [Tue, 18 May 2010 16:18:37 +0000 (09:18 -0700)]
merge from open-source master
Change-Id: I3607454a9257701855354c12ef1f36841c889aea
Scott Main [Tue, 18 May 2010 16:07:39 +0000 (09:07 -0700)]
am
74e151c5: am
5f1d1002: Merge "docs: fix markup error" into froyo
Merge commit '
74e151c54c31cf7324771fcabc06e9fbfe1118ca' into kraken
* commit '
74e151c54c31cf7324771fcabc06e9fbfe1118ca':
docs: fix markup error
Scott Main [Tue, 18 May 2010 16:02:09 +0000 (09:02 -0700)]
am
5f1d1002: Merge "docs: fix markup error" into froyo
Merge commit '
5f1d100298dfafbd996b6deff457e6d1de4008a0' into froyo-plus-aosp
* commit '
5f1d100298dfafbd996b6deff457e6d1de4008a0':
docs: fix markup error
Scott Main [Tue, 18 May 2010 15:59:03 +0000 (08:59 -0700)]
Merge "docs: fix markup error" into froyo
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
OSDN Git Service
