OSDN Git Service

android-x86/frameworks-native.git
14 years agoMerge "Several fixes in AudioDumpInterface:" into kraken
Eric Laurent [Thu, 13 May 2010 06:21:42 +0000 (23:21 -0700)]
Merge "Several fixes in AudioDumpInterface:" into kraken

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

Merge commit 'fa2e3dcd855f573e160dbf258fd60a172b6e3f02' into kraken

* commit 'fa2e3dcd855f573e160dbf258fd60a172b6e3f02':
  Bug 2680071: Rename the Cloud to Device

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 agoanother attempt at fixing the build
Mathias Agopian [Thu, 13 May 2010 01:37:43 +0000 (18:37 -0700)]
another attempt at fixing the build

Change-Id: I80b498d1bbb8f9ffcec4f27802be7ae9977f70ac

14 years agoMerge "SharedBufferStack now can grow up to 16 buffers." into kraken
Mathias Agopian [Thu, 13 May 2010 00:36:46 +0000 (17:36 -0700)]
Merge "SharedBufferStack now can grow up to 16 buffers." into kraken

14 years agoMerge "Refactor some code in surfaceflinger in preparation of upcoming changes" into...
Mathias Agopian [Thu, 13 May 2010 00:35:24 +0000 (17:35 -0700)]
Merge "Refactor some code in surfaceflinger in preparation of upcoming changes" into kraken

14 years agoMerge "remove the "memcpy" hack" into kraken
Mathias Agopian [Thu, 13 May 2010 00:35:12 +0000 (17:35 -0700)]
Merge "remove the "memcpy" hack" into kraken

14 years agoSharedBufferStack now can grow up to 16 buffers.
Mathias Agopian [Fri, 7 May 2010 22:58:44 +0000 (15:58 -0700)]
SharedBufferStack now can grow up to 16 buffers.

there is a new resize() api, which currently only allows growing.

Change-Id: Ia37b81b73be466d2491ffed7f3a23cd8e113c6fe

14 years agoRefactor some code in surfaceflinger in preparation of upcoming changes
Mathias Agopian [Tue, 11 May 2010 03:06:11 +0000 (20:06 -0700)]
Refactor some code in surfaceflinger in preparation of upcoming changes

the new TextureMagager class now handle texture creation and upload
as well as EGL image creation and binding to GraphicBuffers. This is
used indirectly by Layer and directly by LayerBuffer

the new BufferManager class handles the set of buffers used for a
Layer (Surface), it abstracts how many buffer there is as well as
the use of EGLimage vs. regular texture ops (glTexImage2D).

Change-Id: I2da1ddcf27758e6731400f6cc4e20bef35c0a39a

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 agoremove the "memcpy" hack
Mathias Agopian [Tue, 11 May 2010 03:10:10 +0000 (20:10 -0700)]
remove the "memcpy" hack

this hack was used for gpus that don't support cached buffers
for s/w clients. currently we have no gpu with this issue.
this removes quite a bit of complexity.

Change-Id: I72564669f124f92805030e61983711f61c76b6d9

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

Merge commit 'c99c401d93f94d4243ed8cdd5fec101efc9ee265' into kraken

* commit 'c99c401d93f94d4243ed8cdd5fec101efc9ee265':
  docs: add missing path-permissions document

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

Merge commit '8b27c965c8a4cb8ceb4b50484d55270758703768' into kraken

* commit '8b27c965c8a4cb8ceb4b50484d55270758703768':
  docs: fix broken links

14 years agoam bfc63c7b: am 336d7dcb: The default AlertDialog allows cancel. But the default...
Grace Kloba [Wed, 12 May 2010 22:35:37 +0000 (15:35 -0700)]
am bfc63c7b: 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 'bfc63c7b83160fd3e771e5187d317348e72d6c27' into kraken

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

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 agoam 79090cb3: merge from open-source master
The Android Open Source Project [Wed, 12 May 2010 22:06:13 +0000 (15:06 -0700)]
am 79090cb3: merge from open-source master

Merge commit '79090cb3da132d07cd3888ef9242df9872fb4aa1' into kraken

* commit '79090cb3da132d07cd3888ef9242df9872fb4aa1':
  Change license for the UUS Information file.
  Remove ProximityAlerts Receiver when last ProximityAlert expires.

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 agoam 4adacd23: merge from open-source master
The Android Open Source Project [Wed, 12 May 2010 21:56:00 +0000 (14:56 -0700)]
am 4adacd23: merge from open-source master

Merge commit '4adacd23d4c91569b16fe50419f1a91f68d805bd' into kraken

* commit '4adacd23d4c91569b16fe50419f1a91f68d805bd':
  Add support for EVDO Rev B

14 years agoMerge "ZipUtilsRO rewrite based on Dalvik Zip rewrite" into kraken
Kenny Root [Wed, 12 May 2010 21:54:42 +0000 (14:54 -0700)]
Merge "ZipUtilsRO rewrite based on Dalvik Zip rewrite" into kraken

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 agoam ccfd99b1: merge from open-source master
The Android Open Source Project [Wed, 12 May 2010 21:41:40 +0000 (14:41 -0700)]
am ccfd99b1: merge from open-source master

Merge commit 'ccfd99b1e2a64c72ec433ebf5cf98d644ab24614' into kraken

* commit 'ccfd99b1e2a64c72ec433ebf5cf98d644ab24614':
  Support for User to User Signaling (UUS)

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 agoam 7d952644: merge from open-source master
The Android Open Source Project [Wed, 12 May 2010 21:12:25 +0000 (14:12 -0700)]
am 7d952644: merge from open-source master

Merge commit '7d9526445c8631f347c7bf7d944e5bb1dc35b0b5' into kraken

* commit '7d9526445c8631f347c7bf7d944e5bb1dc35b0b5':
  Support to display message when operation is blocked due to FDN being enabled

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 agoam 2a9ae01f: merge from open-source master
The Android Open Source Project [Wed, 12 May 2010 19:44:27 +0000 (12:44 -0700)]
am 2a9ae01f: merge from open-source master

Merge commit '2a9ae01f74e7273ce0d1045754597ea78b88ba69' into kraken

* commit '2a9ae01f74e7273ce0d1045754597ea78b88ba69':
  Corrected repeat count for key repeat in input device.

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 agoam fb234bbe: merge from open-source master
The Android Open Source Project [Wed, 12 May 2010 19:13:18 +0000 (12:13 -0700)]
am fb234bbe: merge from open-source master

Merge commit 'fb234bbe5e7cbae42b4fc8f4ab353ba561599db2' into kraken

* commit 'fb234bbe5e7cbae42b4fc8f4ab353ba561599db2':
  Notify user regarding invalid number during MO call.
  Build software AGL library with correct get_tls() macro for ARMv7 based platforms
  Fix glReadPixels() to verify that both x and y are non-negative.

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 agoam 68b37d14: am a04202b3: Merge "Doc change: remove Google I/O 09 from carousel....
Dirk Dougherty [Wed, 12 May 2010 18:10:10 +0000 (11:10 -0700)]
am 68b37d14: am a04202b3: Merge "Doc change: remove Google I/O 09 from carousel." into froyo

Merge commit '68b37d14708414d3cee418024c178f0a3c7d8b5b' into kraken

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

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 agoSeveral fixes in AudioDumpInterface:
Eric Laurent [Wed, 12 May 2010 15:24:18 +0000 (08:24 -0700)]
Several fixes in AudioDumpInterface:

- forward setMode() and getInputBufferSize() calls to underlying audio hardware interface.
- Allow capture of more than one output stream (previous implementation was only capturing
the first output opened, namely the hardware output).
- Allow capture of input streams: previous implementation was only simulating input streams
when more than one was open at a time by reading from a file on SD card). Now the default
behavior is to capture PCM data read from input stream if it was successfully opened or
simulate capture otherwise.

Change-Id: I7e2892b25e295fc3c19c7eb0f71bfaea5816b73a

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

Merge commit '0d967ff0e2745bc208c3318a67d8ca688c3ea3d9' into kraken

* commit '0d967ff0e2745bc208c3318a67d8ca688c3ea3d9':
  docs: fix broken anchor names

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

Merge commit '052e2102df8e45af2797faff7aefda26aeb345d7' into kraken

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

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

Merge commit '89f74cf66c635c8835d6fc4057c6901037f704dd' into kraken

* commit '89f74cf66c635c8835d6fc4057c6901037f704dd':
  Doc change: update diff report 7-> 8

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

Merge commit 'a250e3287dea625930b1591b7139decc304bf76b' into kraken

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

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

Merge commit 'c8e84e12beb876f904d0090fe021beae73722786' into kraken

* commit 'c8e84e12beb876f904d0090fe021beae73722786':
  Fix imf tests.

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

Merge commit '21f18e9633967e69ebe7a172b902420fec485bba' into kraken

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

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

Merge commit 'd522b270a90cdd5f9bdedeb402b4738cfa294ee5' into kraken

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

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

Merge commit '0130e3837638b998ff28786618bc6a7fc6417711' into kraken

* commit '0130e3837638b998ff28786618bc6a7fc6417711':
  docs: remove allowBackup attribute from documentation

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

Merge commit 'd9712b69ce529fbf50b3b837032c1dc40e623381' into kraken

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

14 years agoam bbafdc64: am 836b2d75: Merge "Don\'t clear the _data column in the audio_meta...
Marco Nelissen [Wed, 12 May 2010 14:56:24 +0000 (07:56 -0700)]
am bbafdc64: 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 'bbafdc6403488b0f7ad564a5a0ff2eed5b87ab7b' into kraken

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

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

Merge commit 'b6e1ec19dd73cb55baef538a9119bcac0f8b9366' into kraken

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

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

Merge commit '84a30dbff1d6e04fd7660983233ae5502b414b07' into kraken

* commit '84a30dbff1d6e04fd7660983233ae5502b414b07':
  docs: add document about app install location

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

Merge commit '712f6408140af90477bccbc64f598c5e51833c7b' into kraken

* commit '712f6408140af90477bccbc64f598c5e51833c7b':
  Doc Change: Docs for NDK r4.

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

Merge commit '9c6895924053c0b732dcb2dd3ef7f419a4dab8c1' into kraken

* commit '9c6895924053c0b732dcb2dd3ef7f419a4dab8c1':
  docs: announce froyo and update IO message

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

Merge commit 'd2084bb689bb680eb886d5cfbd27adc6f2e9da1c' into kraken

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

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

Merge commit 'b003ad17bffeba7875b9708ffeef2300ef28c916' into kraken

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

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

Merge commit '227e443a43d70b9463b2e685688f73cfb1b72096' into kraken

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

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

Merge commit '625de488973f262e56d3ee6825a8cf1ebaee089b' into kraken

* commit '625de488973f262e56d3ee6825a8cf1ebaee089b':
  Bug 2673557: rename datamessaging

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

Merge commit '0c73adb1dead4097b9c7dc04b8a547aaab817e85' into kraken

* commit '0c73adb1dead4097b9c7dc04b8a547aaab817e85':
  Update javadoc in android.media.AudioManager to not hide the

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

Merge commit '6d405cfcfe200c0b60ab6e05047db2bde12f23c3' into kraken

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

14 years agoam ea37d9b4: am aaa01b18: Merge " Fix bug 2670395 and 2599698 When the user...
Jean-Michel Trivi [Wed, 12 May 2010 14:55:09 +0000 (07:55 -0700)]
am ea37d9b4: 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 comp

Merge commit 'ea37d9b489aac1a4a8de71887581fe712e26e144' into kraken

* commit 'ea37d9b489aac1a4a8de71887581fe712e26e144':
  Fix bug 2670395 and 2599698

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

Merge commit 'd8c33747afbe98e893e0569f3bf45b67a9e8e728' into kraken

* commit 'd8c33747afbe98e893e0569f3bf45b67a9e8e728':
  Add remove method in CameraParameters class.

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 agoZipUtilsRO rewrite based on Dalvik Zip rewrite
Kenny Root [Fri, 23 Apr 2010 01:28:29 +0000 (18:28 -0700)]
ZipUtilsRO rewrite based on Dalvik Zip rewrite

Change the way zip archives are handled.  This is necessary to deal with
very large (~1GB) APK files, for which our current approach of mapping
the entire file falls over.

We now do the classic scavenger hunt for the End Of Central Directory
magic on a buffer of data read from the file, instead of a memory-mapped
section.  We use what we find to create a map that covers the Central
Directory only.

If the caller is interested in unpacking the file contents, we have to
do an additional file read to discover the size of the Local File Header
section so we can skip past it.

This is based on Change I745fb15abb in the dalvik tree. Both
implementations share a common ancestry, but the cost of unifying them
outweighs the benefits of wrapping C calls.

Change-Id: Iddacb50fe913917c2845708a530872d65fdbe620

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 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 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 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 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 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 agoMerge "Doc Change: Docs for NDK r4." into froyo
Dirk Dougherty [Tue, 11 May 2010 21:20:24 +0000 (14:20 -0700)]
Merge "Doc Change: Docs for NDK r4." into froyo

14 years agoMerge "docs: announce froyo and update IO message" into froyo
Scott Main [Tue, 11 May 2010 21:04:49 +0000 (14:04 -0700)]
Merge "docs: announce froyo and update IO message" into froyo

14 years agoMerge "LocationManagerService: Call updateNetworkState on providers that are disabled...
Mike Lockwood [Tue, 11 May 2010 20:26:25 +0000 (13:26 -0700)]
Merge "LocationManagerService: Call updateNetworkState on providers that are disabled." into froyo

14 years agoMerge "Add incStrong and decStrong methods to android_native_{window,buffer}_t."...
Jamie Gennis [Tue, 11 May 2010 19:25:31 +0000 (12:25 -0700)]
Merge "Add incStrong and decStrong methods to android_native_{window,buffer}_t." into kraken

14 years agoMerge "Support for customizable socket-read timeouts through the HTTP response."...
Andreas Huber [Tue, 11 May 2010 19:21:14 +0000 (12:21 -0700)]
Merge "Support for customizable socket-read timeouts through the HTTP response." into froyo

14 years agoMerge "Better seek handling and proper reset of the vorbis decoder after a discontinu...
Andreas Huber [Tue, 11 May 2010 19:20:55 +0000 (12:20 -0700)]
Merge "Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)" into froyo

14 years agoMerge "Corrected repeat count for key repeat in input device."
Dianne Hackborn [Tue, 11 May 2010 19:07:32 +0000 (12:07 -0700)]
Merge "Corrected repeat count for key repeat in input device."

14 years agoMerge "Bug 2673557: rename datamessaging" into froyo
Costin Manolache [Tue, 11 May 2010 18:42:58 +0000 (11:42 -0700)]
Merge "Bug 2673557: rename datamessaging" into froyo

14 years agoMerge "Update javadoc in android.media.AudioManager to not hide the registerAudioFocu...
Jean-Michel Trivi [Tue, 11 May 2010 18:40:21 +0000 (11:40 -0700)]
Merge "Update javadoc in android.media.AudioManager to not hide the registerAudioFocusListener() methods." into froyo

14 years agoMerge "Doc Change: cherry-pick from master. ->Testing Procedures documents testing_ec...
Dirk Dougherty [Tue, 11 May 2010 18:33:13 +0000 (11:33 -0700)]
Merge "Doc Change: cherry-pick from  ->Testing Procedures documents testing_eclipse.html, testing_otheride." into froyo