OSDN Git Service

android-x86/frameworks-base.git
14 years agomerge from open-source master
The Android Open Source Project [Fri, 14 May 2010 20:52:52 +0000 (13:52 -0700)]
merge from open-source master

Change-Id: I3e36061d7ba4b8a3962bf8391d663b861a4ede38

14 years agoam 59cfe713: Merge "Doc change: adjustments to the api changes description" into...
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

14 years agoMerge "Doc change: adjustments to the api changes description" into froyo
Dirk Dougherty [Fri, 14 May 2010 20:46:42 +0000 (13:46 -0700)]
Merge "Doc change: adjustments to the api changes description" into froyo

14 years agoDoc change: adjustments to the api changes description
Dirk Dougherty [Fri, 14 May 2010 05:05:56 +0000 (22:05 -0700)]
Doc change: adjustments to the api changes description

Change-Id: I9373b424ae008face124e38a163c980608c2e4df

14 years agoam bba70cdb: Merge "Doc change: add note about future instruction set support." into...
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.

14 years agoMerge "Doc change: add note about future instruction set support." into froyo
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

14 years agoam 89969d4c: Merge "Doc change: documentation for library projects in sdk." into...
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.

14 years agoMerge "Doc change: documentation for library projects in sdk." into froyo
Dirk Dougherty [Fri, 14 May 2010 20:38:20 +0000 (13:38 -0700)]
Merge "Doc change: documentation for library projects in sdk." into froyo

14 years agoDoc change: add note about future instruction set support.
Dirk Dougherty [Fri, 14 May 2010 05:19:10 +0000 (22:19 -0700)]
Doc change: add note about future instruction set support.

Change-Id: If954c1020301f5935c8d9328a531afdddbdad8db

14 years agoDoc change: documentation for library projects in sdk.
Dirk Dougherty [Wed, 12 May 2010 02:09:53 +0000 (19:09 -0700)]
Doc change: documentation for library projects in sdk.

Change-Id: I615d24a046ba2858676e985072563cc90a906551

14 years agoam b83a283a: 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

14 years agodocs: add dev guide for backup
Scott Main [Thu, 29 Apr 2010 20:26:53 +0000 (13:26 -0700)]
docs: add dev guide for backup

Change-Id: I168f6b15d3441c9cbea2cd9699612476c7244530

14 years agoMerge "SetLocaleByCarrier, only if its not an unknown carrier."
Jean-Baptiste Queru [Fri, 14 May 2010 18:39:06 +0000 (11:39 -0700)]
Merge "SetLocaleByCarrier, only if its not an unknown carrier."

14 years agomerge from open-source master
The Android Open Source Project [Fri, 14 May 2010 16:44:36 +0000 (09:44 -0700)]
merge from open-source master

Change-Id: I934cf85c4673f9ca3a9549c2074907ad572310f4

14 years agomerge from open-source master
The Android Open Source Project [Fri, 14 May 2010 16:11:31 +0000 (09:11 -0700)]
merge from open-source master

Change-Id: I57f108d2b3415eddb0b20a4a9dec4c44285de226

14 years agoMerge "Accept media files by file extension in case insensitive manner."
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."

14 years agoam fb473bb6: Merge "Doc change: adjustments for ndk feature description" into froyo
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

14 years agoMerge "Doc change: adjustments for ndk feature description" into froyo
Dirk Dougherty [Fri, 14 May 2010 04:31:10 +0000 (21:31 -0700)]
Merge "Doc change: adjustments for ndk feature description" into froyo

14 years agoDoc change: adjustments for ndk feature description
Dirk Dougherty [Fri, 14 May 2010 04:28:45 +0000 (21:28 -0700)]
Doc change: adjustments for ndk feature description

Change-Id: I3eb35c3d5ad756b7fa71c256b531f262e7940d90

14 years agoam a0711e7b: 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.

14 years agoDoc change: Add compatibility article.
Dirk Dougherty [Fri, 7 May 2010 22:14:56 +0000 (15:14 -0700)]
Doc change: Add compatibility article.

Change-Id: Ie6671813eb88bc8cb92575726f8fcf69eb558d08

14 years agoMerge "Put the wifi status icon in the right place."
Joe Onorato [Thu, 13 May 2010 23:33:22 +0000 (16:33 -0700)]
Merge "Put the wifi status icon in the right place."

14 years agoam c928a11e: Merge "Fix 2672155 Check the code path when enabling disabling packages...
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

14 years agoMerge "Fix 2672155 Check the code path when enabling disabling packages." into froyo
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

14 years agoFix 2672155
Suchi Amalapurapu [Thu, 13 May 2010 19:05:53 +0000 (12:05 -0700)]
Fix 2672155
Check the code path when enabling disabling packages.

Add unit test

Change-Id: I0f0f482a3735234eab3f63ba1f6462574b70144e

14 years agomerge from open-source master
The Android Open Source Project [Thu, 13 May 2010 21:50:16 +0000 (14:50 -0700)]
merge from open-source master

Change-Id: I88a580162b34a80d1e3e7987b7a301c253afa0e8

14 years agoam 098e58da: 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

14 years agoUse SystemClock.elapsedRealtime in ShutdownThread timeout logic
Mike Lockwood [Thu, 13 May 2010 20:29:49 +0000 (16:29 -0400)]
Use SystemClock.elapsedRealtime in ShutdownThread timeout logic

This avoids problems if the time is reset while shutting down.

Change-Id: I54c7c787e55648ebf5a68e79056f92fbac0081ae
Signed-off-by: Mike Lockwood <lockwood@android.com>
14 years agoMerge "Corrected debug message in WindowManager"
Dianne Hackborn [Thu, 13 May 2010 20:25:16 +0000 (13:25 -0700)]
Merge "Corrected debug message in WindowManager"

14 years agoUse integer for loop counter instead of float
Kenny Root [Thu, 13 May 2010 19:15:09 +0000 (12:15 -0700)]
Use integer for loop counter instead of float

Change-Id: Iafaccbb3a3a7cbe0d67ed6827906d713c37ce89b

14 years agoMerge "New test in FrameworkTest for the VelocityTracker class"
Jean-Baptiste Queru [Thu, 13 May 2010 18:39:51 +0000 (11:39 -0700)]
Merge "New test in FrameworkTest for the VelocityTracker class"

14 years agoam 3c78a1b5: Return a runtime error instead of asserting if the AACDecoder is passed...
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.

14 years agoMerge "Preserve '+' in phone numbers imported from SIM."
Jean-Baptiste Queru [Thu, 13 May 2010 18:06:28 +0000 (11:06 -0700)]
Merge "Preserve '+' in phone numbers imported from SIM."

14 years agoReturn a runtime error instead of asserting if the AACDecoder is passed an unsupporte...
Andreas Huber [Thu, 13 May 2010 16:15:21 +0000 (09:15 -0700)]
Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config.

Change-Id: Ie084ed4df5a5d286abd36d9149c2138f8e7ed08a
related-to-bug: 2682221
QA-impact: none

14 years agomerge from open-source master
The Android Open Source Project [Thu, 13 May 2010 16:04:45 +0000 (09:04 -0700)]
merge from open-source master

Change-Id: I51b4eccfde8e74c69ab8e0c051bb8ea718ee7101

14 years agoam 8ea9f130: Merge "Bug 2680071: Rename the Cloud to Device" into froyo
Costin Manolache [Thu, 13 May 2010 02:06:39 +0000 (19:06 -0700)]
am 8ea9f130: Merge "Bug 2680071: Rename the Cloud to Device" into froyo

Merge commit '8ea9f130d24a7dd1e505ba0cf437bdd8a660975e' into froyo-plus-aosp

* commit '8ea9f130d24a7dd1e505ba0cf437bdd8a660975e':
  Bug 2680071: Rename the Cloud to Device

14 years agoMerge "Bug 2680071: Rename the Cloud to Device" into froyo
Costin Manolache [Thu, 13 May 2010 02:04:27 +0000 (19:04 -0700)]
Merge "Bug 2680071: Rename the Cloud to Device" into froyo

14 years agoAdd some documentation about the thread safety of Cursor and some of the SQLite*...
Jeff Hamilton [Wed, 12 May 2010 22:04:33 +0000 (15:04 -0700)]
Add some documentation about the thread safety of Cursor and some of the SQLite* classes.

Change-Id: Icae51052d1c942d7d60bb958d3703411da001079

14 years agoBug 2680071: Rename the Cloud to Device
Costin Manolache [Wed, 12 May 2010 23:04:10 +0000 (16:04 -0700)]
Bug 2680071: Rename the Cloud to Device

Change-Id: I12ab32de393e44a499e3f9e3a0b38f4682156ff5

14 years agoam 38b523af: Merge "docs: add missing path-permissions document" into froyo
Scott Main [Wed, 12 May 2010 22:33:38 +0000 (15:33 -0700)]
am 38b523af: Merge "docs: add missing path-permissions document" into froyo

Merge commit '38b523af5c233dd5f8631ada2cd80b2d75b0efde' into froyo-plus-aosp

* commit '38b523af5c233dd5f8631ada2cd80b2d75b0efde':
  docs: add missing path-permissions document

14 years agoam f0e4ae56: Merge "docs: fix broken links" into froyo
Scott Main [Wed, 12 May 2010 22:33:35 +0000 (15:33 -0700)]
am f0e4ae56: Merge "docs: fix broken links" into froyo

Merge commit 'f0e4ae563228db584041d517672aeadacecba61f' into froyo-plus-aosp

* commit 'f0e4ae563228db584041d517672aeadacecba61f':
  docs: fix broken links

14 years agoam 336d7dcb: The default AlertDialog allows cancel. But the default JSConfim doesn...
Grace Kloba [Wed, 12 May 2010 22:33:30 +0000 (15:33 -0700)]
am 336d7dcb: The default AlertDialog allows cancel. But the default JSConfim doesn\'t have a cancel listener. So when user cancel the dialog, we do not wake up the WebCoreThread. The same code is already done for JSPrompt dialog correctly.

Merge commit '336d7dcb105a43ee4de51fd0f26f277c63662f02' into froyo-plus-aosp

* commit '336d7dcb105a43ee4de51fd0f26f277c63662f02':
  The default AlertDialog allows cancel. But the default

14 years agoMerge "docs: add missing path-permissions document" into froyo
Scott Main [Wed, 12 May 2010 22:01:30 +0000 (15:01 -0700)]
Merge "docs: add missing path-permissions document" into froyo

14 years agomerge from open-source master
The Android Open Source Project [Wed, 12 May 2010 21:54:38 +0000 (14:54 -0700)]
merge from open-source master

Change-Id: Ifb008642faddf6b83769cdaa5bd67d21591b9eaa

14 years agoMerge "docs: fix broken links" into froyo
Scott Main [Wed, 12 May 2010 21:53:35 +0000 (14:53 -0700)]
Merge "docs: fix broken links" into froyo

14 years agomerge from open-source master
The Android Open Source Project [Wed, 12 May 2010 21:53:25 +0000 (14:53 -0700)]
merge from open-source master

Change-Id: If6730b50627b2231bd345e594d8d30a37557849e

14 years agodocs: fix broken links
Scott Main [Wed, 12 May 2010 21:49:38 +0000 (14:49 -0700)]
docs: fix broken links

Change-Id: I2720ce4fe30b1e6ff35b91f48a98ead8999ed1ab

14 years agomerge from open-source master
The Android Open Source Project [Wed, 12 May 2010 21:39:38 +0000 (14:39 -0700)]
merge from open-source master

Change-Id: Ib092e6ae5151bbcdf56b9b3a7adbaee7bb5df8b5

14 years agoThe default AlertDialog allows cancel. But the default
Grace Kloba [Wed, 12 May 2010 21:28:07 +0000 (14:28 -0700)]
The default AlertDialog allows cancel. But the default
JSConfim doesn't have a cancel listener. So when
user cancel the dialog, we do not wake up the WebCoreThread.
The same code is already done for JSPrompt dialog correctly.

Fix http://b/issue?id=2679139

14 years agomerge from open-source master
The Android Open Source Project [Wed, 12 May 2010 21:10:23 +0000 (14:10 -0700)]
merge from open-source master

Change-Id: Ib5ea9745c2b652d64646e3e28c12e63815321ff9

14 years agomerge from open-source master
The Android Open Source Project [Wed, 12 May 2010 19:33:35 +0000 (12:33 -0700)]
merge from open-source master

Change-Id: I24ecfac151c0ddc27237d711c95b8fe488d7931b

14 years agoChange license for the UUS Information file.
Naveen Kalla [Wed, 12 May 2010 18:53:00 +0000 (11:53 -0700)]
Change license for the UUS Information file.

Change-Id: Idd77e9078354a46605142c2eb704823aaa7d560d

14 years agomerge from open-source master
The Android Open Source Project [Wed, 12 May 2010 18:58:14 +0000 (11:58 -0700)]
merge from open-source master

Change-Id: I022d0781a232396e2b8a67a420ecf50e64b87d8c

14 years agodocs: add missing path-permissions document
Scott Main [Wed, 12 May 2010 18:31:03 +0000 (11:31 -0700)]
docs: add missing path-permissions document

Change-Id: I926f6ead8babbb66ead386890c143e1bc3ddf229

14 years agoam a04202b3: Merge "Doc change: remove Google I/O 09 from carousel." into froyo
Dirk Dougherty [Wed, 12 May 2010 18:08:46 +0000 (11:08 -0700)]
am a04202b3: Merge "Doc change: remove Google I/O 09 from carousel." into froyo

Merge commit 'a04202b3258845688bcd8c6208222235569df733' into froyo-plus-aosp

* commit 'a04202b3258845688bcd8c6208222235569df733':
  Doc change: remove Google I/O 09 from carousel.

14 years agoMerge "Doc change: remove Google I/O 09 from carousel." into froyo
Dirk Dougherty [Wed, 12 May 2010 18:05:03 +0000 (11:05 -0700)]
Merge "Doc change: remove Google I/O 09 from carousel." into froyo

14 years agoDoc change: remove Google I/O 09 from carousel.
Dirk Dougherty [Wed, 12 May 2010 17:48:31 +0000 (10:48 -0700)]
Doc change: remove Google I/O 09 from carousel.

Change-Id: I5b97ceef5316930266d1b4581217afad74129372

14 years agoam 18dc51d4: Merge "docs: fix broken anchor names" into froyo
Scott Main [Wed, 12 May 2010 14:50:59 +0000 (07:50 -0700)]
am 18dc51d4: Merge "docs: fix broken anchor names" into froyo

Merge commit '18dc51d4137c5cf8364541e25ad9ded203342c6b' into froyo-plus-aosp

* commit '18dc51d4137c5cf8364541e25ad9ded203342c6b':
  docs: fix broken anchor names

14 years agoam 0d1b0814: Doc change: updates for new tools, platform, adt versions. Misc other...
Dirk Dougherty [Wed, 12 May 2010 14:50:57 +0000 (07:50 -0700)]
am 0d1b0814: Doc change: updates for new tools, platform, adt versions. Misc other fixes updates in doc files.

Merge commit '0d1b0814be24f501395bf175fba8691117f782d5' into froyo-plus-aosp

* commit '0d1b0814be24f501395bf175fba8691117f782d5':
  Doc change: updates for new tools, platform, adt versions. Misc other fixes updates in doc files.

14 years agoam 4d5275e7: Merge "Doc change: update diff report 7-> 8" into froyo
Dirk Dougherty [Wed, 12 May 2010 14:50:53 +0000 (07:50 -0700)]
am 4d5275e7: Merge "Doc change: update diff report 7-> 8" into froyo

Merge commit '4d5275e723221df67aad00a440dd6a2e9a22caae' into froyo-plus-aosp

* commit '4d5275e723221df67aad00a440dd6a2e9a22caae':
  Doc change: update diff report 7-> 8

14 years agoam 827a50dd: Merge "docs: remove the dashboard from the sidenav for the offline docs...
Scott Main [Wed, 12 May 2010 14:50:48 +0000 (07:50 -0700)]
am 827a50dd: Merge "docs: remove the dashboard from the sidenav for the offline docs" into froyo

Merge commit '827a50dda4c1900ab5333f8c2d3705796ff4649d' into froyo-plus-aosp

* commit '827a50dda4c1900ab5333f8c2d3705796ff4649d':
  docs: remove the dashboard from the sidenav for the offline docs

14 years agoam b4c9a8f6: Merge "Fix imf tests." into froyo
Brett Chabot [Wed, 12 May 2010 14:50:44 +0000 (07:50 -0700)]
am b4c9a8f6: Merge "Fix imf tests." into froyo

Merge commit 'b4c9a8f664f1dd57644e6d6cf2723eff9a505072' into froyo-plus-aosp

* commit 'b4c9a8f664f1dd57644e6d6cf2723eff9a505072':
  Fix imf tests.

14 years agoam bb129dc5: docs: make Notifying the User an expandable list
Scott Main [Wed, 12 May 2010 14:50:41 +0000 (07:50 -0700)]
am bb129dc5: docs: make Notifying the User an expandable list

Merge commit 'bb129dc57b4a5be24ab7c5e436fa591f61e28d3d' into froyo-plus-aosp

* commit 'bb129dc57b4a5be24ab7c5e436fa591f61e28d3d':
  docs: make Notifying the User an expandable list

14 years agoam a225e3b1: docs: add quickview box with "see also" links for some articles
Scott Main [Wed, 12 May 2010 14:50:36 +0000 (07:50 -0700)]
am a225e3b1: docs: add quickview box with "see also" links for some articles

Merge commit 'a225e3b1cd02da0f748f1a8e7341c727eff28085' into froyo-plus-aosp

* commit 'a225e3b1cd02da0f748f1a8e7341c727eff28085':
  docs: add quickview box with "see also" links for some articles

14 years agoam 6bc3304b: Merge "docs: remove allowBackup attribute from documentation" into froyo
Scott Main [Wed, 12 May 2010 14:50:30 +0000 (07:50 -0700)]
am 6bc3304b: Merge "docs: remove allowBackup attribute from documentation" into froyo

Merge commit '6bc3304b74ba41bf9fd132d48c7bb764d631d3fa' into froyo-plus-aosp

* commit '6bc3304b74ba41bf9fd132d48c7bb764d631d3fa':
  docs: remove allowBackup attribute from documentation

14 years agoam b1235a57: Merge "Hide two audio focus methods." into froyo
Xavier Ducrohet [Wed, 12 May 2010 14:50:19 +0000 (07:50 -0700)]
am b1235a57: Merge "Hide two audio focus methods." into froyo

Merge commit 'b1235a57a09174179553acecef2370354bdcbf41' into froyo-plus-aosp

* commit 'b1235a57a09174179553acecef2370354bdcbf41':
  Hide two audio focus methods.

14 years agoam 836b2d75: Merge "Don\'t clear the _data column in the audio_meta table, since...
Marco Nelissen [Wed, 12 May 2010 14:50:14 +0000 (07:50 -0700)]
am 836b2d75: Merge "Don\'t clear the _data column in the audio_meta table, since it isn\'t needed, and causes a sqlite constraint exception. Bug 2671792." into froyo

Merge commit '836b2d75ef86487ecae0ae834ecbab324fd99471' into froyo-plus-aosp

* commit '836b2d75ef86487ecae0ae834ecbab324fd99471':
  Don't clear the _data column in the audio_meta table, since it isn't

14 years agoam 037cd341: Merge "Fix issue #2676378: Activity Manager Crash on FRF40" into froyo
Dianne Hackborn [Wed, 12 May 2010 14:50:09 +0000 (07:50 -0700)]
am 037cd341: Merge "Fix issue #2676378: Activity Manager Crash on FRF40" into froyo

Merge commit '037cd3413a925c6f449050096a7cd4aab3207612' into froyo-plus-aosp

* commit '037cd3413a925c6f449050096a7cd4aab3207612':
  Fix issue #2676378: Activity Manager Crash on FRF40

14 years agoam 5cdf5fdc: docs: add document about app install location
Scott Main [Wed, 12 May 2010 14:50:02 +0000 (07:50 -0700)]
am 5cdf5fdc: docs: add document about app install location

Merge commit '5cdf5fdcba846bd4659084f5f9e5a1e367dbea5d' into froyo-plus-aosp

* commit '5cdf5fdcba846bd4659084f5f9e5a1e367dbea5d':
  docs: add document about app install location

14 years agoam 8acb68e9: Merge "Doc Change: Docs for NDK r4." into froyo
Dirk Dougherty [Wed, 12 May 2010 14:49:57 +0000 (07:49 -0700)]
am 8acb68e9: Merge "Doc Change: Docs for NDK r4." into froyo

Merge commit '8acb68e9aae7f6766b88440ede6598da63db9fdd' into froyo-plus-aosp

* commit '8acb68e9aae7f6766b88440ede6598da63db9fdd':
  Doc Change: Docs for NDK r4.

14 years agoam c80b95a8: Merge "docs: announce froyo and update IO message" into froyo
Scott Main [Wed, 12 May 2010 14:49:51 +0000 (07:49 -0700)]
am c80b95a8: Merge "docs: announce froyo and update IO message" into froyo

Merge commit 'c80b95a85ae31eba80870cb3416fd2c25821c056' into froyo-plus-aosp

* commit 'c80b95a85ae31eba80870cb3416fd2c25821c056':
  docs: announce froyo and update IO message

14 years agoam e1d7dca6: Merge "LocationManagerService: Call updateNetworkState on providers...
Mike Lockwood [Wed, 12 May 2010 14:49:45 +0000 (07:49 -0700)]
am e1d7dca6: Merge "LocationManagerService: Call updateNetworkState on providers that are disabled." into froyo

Merge commit 'e1d7dca608ced72c75bf906c7267a1ef30349826' into froyo-plus-aosp

* commit 'e1d7dca608ced72c75bf906c7267a1ef30349826':
  LocationManagerService: Call updateNetworkState on providers that are disabled.

14 years agoam e0dc80f8: Merge "Support for customizable socket-read timeouts through the HTTP...
Andreas Huber [Wed, 12 May 2010 14:49:39 +0000 (07:49 -0700)]
am e0dc80f8: Merge "Support for customizable socket-read timeouts through the HTTP response." into froyo

Merge commit 'e0dc80f878b56ed744bd06d341716fcfff4e3acc' into froyo-plus-aosp

* commit 'e0dc80f878b56ed744bd06d341716fcfff4e3acc':
  Support for customizable socket-read timeouts through the HTTP response.

14 years agoam d6ad7c85: Merge "Better seek handling and proper reset of the vorbis decoder after...
Andreas Huber [Wed, 12 May 2010 14:49:31 +0000 (07:49 -0700)]
am d6ad7c85: Merge "Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)" into froyo

Merge commit 'd6ad7c85faf55fa8d0459f0fbc4fa32abdfefb6e' into froyo-plus-aosp

* commit 'd6ad7c85faf55fa8d0459f0fbc4fa32abdfefb6e':
  Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)

14 years agoam e2055fe4: Merge "Bug 2673557: rename datamessaging" into froyo
Costin Manolache [Wed, 12 May 2010 14:49:16 +0000 (07:49 -0700)]
am e2055fe4: Merge "Bug 2673557: rename datamessaging" into froyo

Merge commit 'e2055fe4258f8085a88328579c852ec26d77bb10' into froyo-plus-aosp

* commit 'e2055fe4258f8085a88328579c852ec26d77bb10':
  Bug 2673557: rename datamessaging

14 years agoam 3e90c76c: Merge "Update javadoc in android.media.AudioManager to not hide the...
Jean-Michel Trivi [Wed, 12 May 2010 14:49:10 +0000 (07:49 -0700)]
am 3e90c76c: Merge "Update javadoc in android.media.AudioManager to not hide the registerAudioFocusListener() methods." into froyo

Merge commit '3e90c76c12803cd1b116030fd124b7b870d25342' into froyo-plus-aosp

* commit '3e90c76c12803cd1b116030fd124b7b870d25342':
  Update javadoc in android.media.AudioManager to not hide the

14 years agoam fe089334: Merge "Doc Change: cherry-pick from master. ->Testing Procedures documen...
Dirk Dougherty [Wed, 12 May 2010 14:49:00 +0000 (07:49 -0700)]
am fe089334: Merge "Doc Change: cherry-pick from  ->Testing Procedures documents testing_eclipse.html, testing_otheride." into froyo

Merge commit 'fe08933450f4be42c9b3eac900c64f23857ecd17' into froyo-plus-aosp

* commit 'fe08933450f4be42c9b3eac900c64f23857ecd17':
  Doc Change: cherry-pick from master. ->Testing Procedures documents testing_eclipse.html, testing_otheride.

14 years agoam aaa01b18: Merge " Fix bug 2670395 and 2599698 When the user selects a ...
Jean-Michel Trivi [Wed, 12 May 2010 14:48:50 +0000 (07:48 -0700)]
am aaa01b18: Merge "    Fix bug 2670395 and 2599698     When the user selects a "Silent" notification sound, the Uri encoded     path is an empty string. Setting this Uri as the data source of the     MediaPlayer used to play notifications caused the completion listen

Merge commit 'aaa01b181c0eea4ff6496d446e25e499b12ca14c' into froyo-plus-aosp

* commit 'aaa01b181c0eea4ff6496d446e25e499b12ca14c':
  Fix bug 2670395 and 2599698

14 years agoam 78624e41: Add remove method in CameraParameters class.
Wu-cheng Li [Wed, 12 May 2010 14:48:41 +0000 (07:48 -0700)]
am 78624e41: Add remove method in CameraParameters class.

Merge commit '78624e41da166712aaa5ae47e4d3467337ac810a' into froyo-plus-aosp

* commit '78624e41da166712aaa5ae47e4d3467337ac810a':
  Add remove method in CameraParameters class.

14 years agoNew test in FrameworkTest for the VelocityTracker class
Marc Capdevielle [Wed, 12 May 2010 07:31:55 +0000 (09:31 +0200)]
New test in FrameworkTest for the VelocityTracker class

14 years agoCorrected debug message in WindowManager
Johan Alfven [Wed, 12 May 2010 07:00:28 +0000 (09:00 +0200)]
Corrected debug message in WindowManager

When WindowManager reports "Key dispatching timed out"
it prints out information about the window state that was
present at the time the key was sent to that window.
There is a minor error in the class representing the
recorded window state so that the currently focused window
is printed instead of the recorded focused window.

Change-Id: I29a5471ef725e30f812ffd57fd4597ce81c0c7f2

14 years agoMerge "docs: fix broken anchor names" into froyo
Scott Main [Wed, 12 May 2010 03:13:26 +0000 (20:13 -0700)]
Merge "docs: fix broken anchor names" into froyo

14 years agoDoc change: updates for new tools, platform, adt versions. Misc other fixes updates...
Dirk Dougherty [Thu, 8 Apr 2010 00:05:16 +0000 (17:05 -0700)]
Doc change: updates for new tools, platform, adt versions. Misc other fixes updates in doc files.

Change-Id: I7abf541316f2796079cf646a3294db535fcaaa8a

14 years agoMerge "Doc change: update diff report 7-> 8" into froyo
Dirk Dougherty [Wed, 12 May 2010 02:53:04 +0000 (19:53 -0700)]
Merge "Doc change: update diff report 7-> 8" into froyo

14 years agoDoc change: update diff report 7-> 8
Dirk Dougherty [Wed, 12 May 2010 02:35:15 +0000 (19:35 -0700)]
Doc change: update diff report 7-> 8

Change-Id: I376622ae9afff8effc1153129eb68a8f53436ad4

14 years agodocs: fix broken anchor names
Scott Main [Wed, 12 May 2010 02:28:31 +0000 (19:28 -0700)]
docs: fix broken anchor names

Change-Id: I9eafcddf55c56a95ac3ee631ae9216ff544759fc

14 years agoMerge "docs: remove the dashboard from the sidenav for the offline docs" into froyo
Scott Main [Wed, 12 May 2010 02:25:19 +0000 (19:25 -0700)]
Merge "docs: remove the dashboard from the sidenav for the offline docs" into froyo

14 years agoMerge "Fix imf tests." into froyo
Brett Chabot [Wed, 12 May 2010 02:17:04 +0000 (19:17 -0700)]
Merge "Fix imf tests." into froyo

14 years agodocs: remove the dashboard from the sidenav for the offline docs
Scott Main [Wed, 12 May 2010 02:05:04 +0000 (19:05 -0700)]
docs: remove the dashboard from the sidenav for the offline docs

Change-Id: I65c9d8897d6eef9ee8e09daab239b20ed7551cd7

14 years agoFix imf tests.
Brett Chabot [Wed, 12 May 2010 01:51:16 +0000 (18:51 -0700)]
Fix imf tests.

- fix hard keyboard detection logic
- use FLAG_ACTIVITY_MULTIPLE_TASK to force test activities to start with IME

Bugs 26773202677355

Change-Id: I1b943ee17fddcae5087faefa9fa5603dd3f18ec1

14 years agodocs: make Notifying the User an expandable list
Scott Main [Wed, 12 May 2010 01:00:44 +0000 (18:00 -0700)]
docs: make Notifying the User an expandable list

Change-Id: I287a7e15a4461defa96903c7e922b8640c0bb257

14 years agodocs: add quickview box with "see also" links for some articles
Scott Main [Wed, 12 May 2010 00:43:43 +0000 (17:43 -0700)]
docs: add quickview box with "see also" links for some articles

Change-Id: I2d5e83e691e61731b30b4741d02e096d5ef76fc2

14 years agoMerge "docs: remove allowBackup attribute from documentation" into froyo
Scott Main [Tue, 11 May 2010 22:25:38 +0000 (15:25 -0700)]
Merge "docs: remove allowBackup attribute from documentation" into froyo

14 years agoPreserve '+' in phone numbers imported from SIM.
Samuel Holmberg [Wed, 24 Feb 2010 11:15:15 +0000 (12:15 +0100)]
Preserve '+' in phone numbers imported from SIM.

Contacts with phonenumbers beginning with '+' lose the '+' in the
phonebook when imported from SIM.

This was only noticable on ADN-records with unknown NPI-values which
isn't very usual.

Change-Id: I181249759ae3d4181dd3cf627c7a588394b80419

14 years agoMerge "Hide two audio focus methods." into froyo
Xavier Ducrohet [Tue, 11 May 2010 21:48:48 +0000 (14:48 -0700)]
Merge "Hide two audio focus methods." into froyo

14 years agoMerge "Don't clear the _data column in the audio_meta table, since it isn't needed...
Marco Nelissen [Tue, 11 May 2010 21:36:16 +0000 (14:36 -0700)]
Merge "Don't clear the _data column in the audio_meta table, since it isn't needed, and causes a sqlite constraint exception. Bug 2671792." into froyo

14 years agoHide two audio focus methods.
Xavier Ducrohet [Tue, 11 May 2010 21:19:40 +0000 (14:19 -0700)]
Hide two audio focus methods.

Change-Id: I53ddf736892cde8edfaffa7d69dd9c234df52efa

14 years agoMerge "Fix issue #2676378: Activity Manager Crash on FRF40" into froyo
Dianne Hackborn [Tue, 11 May 2010 21:26:43 +0000 (14:26 -0700)]
Merge "Fix issue #2676378: Activity Manager Crash on FRF40" into froyo

14 years agoRemove ProximityAlerts Receiver when last ProximityAlert expires.
Sean Foy [Thu, 4 Mar 2010 18:17:54 +0000 (12:17 -0600)]
Remove ProximityAlerts Receiver when last ProximityAlert expires.

Remove the ProximityAlerts update Receiver when the last ProximityAlert expires.
Fixes issue 6900.

Change-Id: Ida1970c084e71df47b204c64986a065cb75d0c13

14 years agodocs: add document about app install location
Scott Main [Tue, 11 May 2010 21:21:53 +0000 (14:21 -0700)]
docs: add document about app install location

Change-Id: Ife7d79ce8374f3435f4850cbf97d163e69bf8d26