Romain Guy
39ced7d0b7
Merge "Add and document .nomedia constant for MediaStore (Issue 6365)"
2010-05-19 00:03:34 -07:00
Romain Guy
a49307b993
Merge "Text disappears when selecting text in text editor."
2010-05-19 00:01:55 -07:00
Romain Guy
d93fe7c0ea
Merge "Removed Calls to deprecated APIs"
2010-05-19 00:01:02 -07:00
Romain Guy
bcb72f9af7
Merge "Improved error handling when font loading fails."
2010-05-18 23:51:16 -07:00
Suchi Amalapurapu
aa2c917926
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
2010-05-18 14:53:37 -07:00
Suchi Amalapurapu
4f7c9354c5
Merge "Uncomment a test that was marked as STOPSHIP Add MediumTest tag" into froyo
2010-05-18 14:51:55 -07:00
Jaikumar Ganesh
ce8ccb1e20
am ef95aceb: Merge "Removing STOPSHIP logs." into froyo
...
Merge commit 'ef95acebdc44a7cf2990c4302850fcb112b695d2' into froyo-plus-aosp
* commit 'ef95acebdc44a7cf2990c4302850fcb112b695d2':
Removing STOPSHIP logs.
2010-05-18 14:51:40 -07:00
Jaikumar Ganesh
c6c11bdbe0
Merge "Removing STOPSHIP logs." into froyo
2010-05-18 14:48:05 -07:00
Eric Laurent
558eec8011
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
2010-05-18 14:18:57 -07:00
Suchi Amalapurapu
565d56d362
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
2010-05-18 13:16:13 -07:00
The Android Open Source Project
5c8f92bedf
merge from open-source master
...
Change-Id: Ib711450566694550d9cb9ba01c25599010d2e5e4
2010-05-18 12:47:02 -07:00
The Android Open Source Project
7074d8febb
merge from open-source master
...
Change-Id: Ib90da5365c873e542d79f036c32ec9b178cd8da0
2010-05-18 11:08:12 -07:00
Jean-Baptiste Queru
9addb68e3b
Merge "Fix some typos and other cosmetic cleanups in telephony framework."
2010-05-18 10:34:42 -07:00
Jean-Baptiste Queru
ff796e109f
Merge "Abort FDN delete when number is empty (instead of name)"
2010-05-18 10:14:14 -07:00
The Android Open Source Project
645ab2efb0
merge from open-source master
...
Change-Id: I3607454a9257701855354c12ef1f36841c889aea
2010-05-18 09:18:37 -07:00
Scott Main
e16cbc55b1
am 5f1d1002: Merge "docs: fix markup error" into froyo
...
Merge commit '5f1d100298dfafbd996b6deff457e6d1de4008a0' into froyo-plus-aosp
* commit '5f1d100298dfafbd996b6deff457e6d1de4008a0':
docs: fix markup error
2010-05-18 09:02:09 -07:00
Scott Main
86080540cb
Merge "docs: fix markup error" into froyo
2010-05-18 08:59:03 -07:00
Scott Main
573edfa591
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
2010-05-17 18:01:28 -07:00
Scott Main
0c9d6432d5
Merge "docs: revise webview description and add info for targeting screen densities" into froyo
2010-05-17 17:59:37 -07:00
Dirk Dougherty
846ef80952
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
2010-05-17 17:37:28 -07:00
Dirk Dougherty
1769eecb4a
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
2010-05-17 17:04:48 -07:00
Mike Lockwood
a309fb7ae7
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.
2010-05-17 14:56:53 -07:00
Kenny Root
b118f139f4
am cfa2de30: Import revised translations
...
Merge commit 'cfa2de303e58b971e334363356d29601e61d11c8' into froyo-plus-aosp
* commit 'cfa2de303e58b971e334363356d29601e61d11c8':
Import revised translations
2010-05-17 11:37:35 -07:00
The Android Open Source Project
ba7718b979
merge from open-source master
...
Change-Id: I139c349b80b2cecfbdc30bd697cba099740293d9
2010-05-17 10:38:00 -07:00
Jean-Baptiste Queru
0e08624ad2
Merge "Updated RGB LED test cases"
2010-05-17 09:12:43 -07:00
The Android Open Source Project
5a64b6daec
merge from open-source master
...
Change-Id: Ia0201ec7be4c112569b8775429d1c9674eb3b661
2010-05-17 08:56:54 -07:00
Romain Guy
9100be5973
Merge "Fixing indeterminate progress bar animation state."
2010-05-15 12:34:05 -07:00
Chung-yih Wang
74368e0bb6
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.
2010-05-14 23:16:31 -07:00
Chung-yih Wang
41613ed3bf
Merge "Make the SSID field of WifiConfiguration consistent with API description." into froyo
2010-05-14 23:15:04 -07:00
Dianne Hackborn
fdcc3559ac
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
2010-05-14 23:11:33 -07:00
Jeff Hamilton
e7dd3adaf9
Merge "Modified libdrm to support SuperH platform"
2010-05-14 19:36:40 -07:00
Dirk Dougherty
42e980e1a0
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.
2010-05-14 18:42:11 -07:00
Andreas Huber
2188a17156
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.
2010-05-14 16:28:09 -07:00
The Android Open Source Project
4c53558835
merge from open-source master
...
Change-Id: I0249c6d796b35af9ba08cbccd463a1f5cf779ecd
2010-05-14 15:04:52 -07:00
Scott Main
cf6dd9bdef
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
2010-05-14 14:24:44 -07:00
Dirk Dougherty
d1ad52a21f
am 60026c3a: Merge "Doc change: adjust compatibility doc." into froyo
...
Merge commit '60026c3ab0093e6d4cd464061ab9f36d4d041532' into froyo-plus-aosp
* commit '60026c3ab0093e6d4cd464061ab9f36d4d041532':
Doc change: adjust compatibility doc.
2010-05-14 14:00:12 -07:00
Dirk Dougherty
9b0f549757
Merge "Doc change: adjust compatibility doc." into froyo
2010-05-14 13:58:12 -07:00
The Android Open Source Project
4dd72e10ee
merge from open-source master
...
Change-Id: I3e36061d7ba4b8a3962bf8391d663b861a4ede38
2010-05-14 13:52:52 -07:00
Dirk Dougherty
1e588cfedc
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
2010-05-14 13:48:04 -07:00
Dirk Dougherty
2363a9d496
Merge "Doc change: adjustments to the api changes description" into froyo
2010-05-14 13:46:42 -07:00
Dirk Dougherty
b7a9cbc7e1
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.
2010-05-14 13:45:17 -07:00
Dirk Dougherty
c04d390b92
Merge "Doc change: add note about future instruction set support." into froyo
2010-05-14 13:43:19 -07:00
Dirk Dougherty
4d8158737f
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.
2010-05-14 13:40:19 -07:00
Jean-Baptiste Queru
6b4a87862e
Merge "Only hold a weak pointer on SurfaceComposerClients"
2010-05-14 13:39:48 -07:00
Dirk Dougherty
a3f10c57af
Merge "Doc change: documentation for library projects in sdk." into froyo
2010-05-14 13:38:20 -07:00
Scott Main
62cabab267
am b83a283a: docs: add dev guide for backup
...
Merge commit 'b83a283ac178ab0a72f1d811189d79b26097835e' into froyo-plus-aosp
* commit 'b83a283ac178ab0a72f1d811189d79b26097835e':
docs: add dev guide for backup
2010-05-14 11:53:44 -07:00
Jean-Baptiste Queru
d181206cab
Merge "SetLocaleByCarrier, only if its not an unknown carrier."
2010-05-14 11:39:06 -07:00
The Android Open Source Project
f614ba9a79
merge from open-source master
...
Change-Id: I934cf85c4673f9ca3a9549c2074907ad572310f4
2010-05-14 09:44:36 -07:00
The Android Open Source Project
d69ec09f47
merge from open-source master
...
Change-Id: I57f108d2b3415eddb0b20a4a9dec4c44285de226
2010-05-14 09:11:31 -07:00
Jean-Baptiste Queru
a7b36de932
Merge "Accept media files by file extension in case insensitive manner."
2010-05-14 09:06:43 -07:00