Commit Graph

15314 Commits

Author SHA1 Message Date
Mathias Agopian
7fe53f9a0d Merge "Refactor some code in surfaceflinger in preparation of upcoming changes" into kraken 2010-05-12 17:35:24 -07:00
Mathias Agopian
d292310655 Merge "remove the "memcpy" hack" into kraken 2010-05-12 17:35:12 -07:00
Mathias Agopian
d606de6bb6 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
2010-05-12 17:26:22 -07:00
Mathias Agopian
89141f9492 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
2010-05-12 15:44:26 -07:00
Scott Main
0bd38d096b 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
2010-05-12 15:35:47 -07:00
Scott Main
d164e9ef78 am 8b27c965: am f0e4ae56: Merge "docs: fix broken links" into froyo
Merge commit '8b27c965c8a4cb8ceb4b50484d55270758703768' into kraken

* commit '8b27c965c8a4cb8ceb4b50484d55270758703768':
  docs: fix broken links
2010-05-12 15:35:41 -07:00
Grace Kloba
2b5146827e 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
2010-05-12 15:35:37 -07:00
Scott Main
a4d5d705ae 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
2010-05-12 15:33:38 -07:00
Scott Main
d9cb81c4d1 am f0e4ae56: Merge "docs: fix broken links" into froyo
Merge commit 'f0e4ae563228db584041d517672aeadacecba61f' into froyo-plus-aosp

* commit 'f0e4ae563228db584041d517672aeadacecba61f':
  docs: fix broken links
2010-05-12 15:33:35 -07:00
Grace Kloba
7f2992db53 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
2010-05-12 15:33:30 -07:00
The Android Open Source Project
400bb7ce30 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.
2010-05-12 15:06:13 -07:00
Scott Main
7a789c8b1a Merge "docs: add missing path-permissions document" into froyo 2010-05-12 15:01:31 -07:00
The Android Open Source Project
ae5c954b68 am 4adacd23: merge from open-source master
Merge commit '4adacd23d4c91569b16fe50419f1a91f68d805bd' into kraken

* commit '4adacd23d4c91569b16fe50419f1a91f68d805bd':
  Add support for EVDO Rev B
2010-05-12 14:56:00 -07:00
Kenny Root
9b7640933e Merge "ZipUtilsRO rewrite based on Dalvik Zip rewrite" into kraken 2010-05-12 14:54:42 -07:00
The Android Open Source Project
7b880ae492 merge from open-source master
Change-Id: Ifb008642faddf6b83769cdaa5bd67d21591b9eaa
2010-05-12 14:54:38 -07:00
Scott Main
003f8c3ea6 Merge "docs: fix broken links" into froyo 2010-05-12 14:53:35 -07:00
The Android Open Source Project
e0281b61c7 merge from open-source master
Change-Id: If6730b50627b2231bd345e594d8d30a37557849e
2010-05-12 14:53:25 -07:00
The Android Open Source Project
09cb2f6932 am ccfd99b1: merge from open-source master
Merge commit 'ccfd99b1e2a64c72ec433ebf5cf98d644ab24614' into kraken

* commit 'ccfd99b1e2a64c72ec433ebf5cf98d644ab24614':
  Support for User to User Signaling (UUS)
2010-05-12 14:41:40 -07:00
The Android Open Source Project
327e55780f merge from open-source master
Change-Id: Ib092e6ae5151bbcdf56b9b3a7adbaee7bb5df8b5
2010-05-12 14:39:38 -07:00
The Android Open Source Project
6ddb6ff99e 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
2010-05-12 14:12:25 -07:00
The Android Open Source Project
56151325d0 merge from open-source master
Change-Id: Ib5ea9745c2b652d64646e3e28c12e63815321ff9
2010-05-12 14:10:23 -07:00
The Android Open Source Project
8dbc266224 am 2a9ae01f: merge from open-source master
Merge commit '2a9ae01f74e7273ce0d1045754597ea78b88ba69' into kraken

* commit '2a9ae01f74e7273ce0d1045754597ea78b88ba69':
  Corrected repeat count for key repeat in input device.
2010-05-12 12:44:27 -07:00
The Android Open Source Project
049570cbb1 merge from open-source master
Change-Id: I24ecfac151c0ddc27237d711c95b8fe488d7931b
2010-05-12 12:33:35 -07:00
The Android Open Source Project
e4582835f0 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.
2010-05-12 12:13:18 -07:00
The Android Open Source Project
c77a20a9d6 merge from open-source master
Change-Id: I022d0781a232396e2b8a67a420ecf50e64b87d8c
2010-05-12 11:58:14 -07:00
Dirk Dougherty
8d5b2c4f2f 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.
2010-05-12 11:10:10 -07:00
Dirk Dougherty
cd406480fa 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.
2010-05-12 11:08:46 -07:00
Dirk Dougherty
5d8d9f1ff1 Merge "Doc change: remove Google I/O 09 from carousel." into froyo 2010-05-12 11:05:03 -07:00
Scott Main
6759221873 am 0d967ff0: am 18dc51d4: Merge "docs: fix broken anchor names" into froyo
Merge commit '0d967ff0e2745bc208c3318a67d8ca688c3ea3d9' into kraken

* commit '0d967ff0e2745bc208c3318a67d8ca688c3ea3d9':
  docs: fix broken anchor names
2010-05-12 07:57:13 -07:00
Dirk Dougherty
38adab61df 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.
2010-05-12 07:57:10 -07:00
Dirk Dougherty
b5064933d8 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
2010-05-12 07:57:06 -07:00
Scott Main
68754870e4 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
2010-05-12 07:57:02 -07:00
Brett Chabot
491066ddd5 am c8e84e12: am b4c9a8f6: Merge "Fix imf tests." into froyo
Merge commit 'c8e84e12beb876f904d0090fe021beae73722786' into kraken

* commit 'c8e84e12beb876f904d0090fe021beae73722786':
  Fix imf tests.
2010-05-12 07:56:54 -07:00
Scott Main
52f50ef3d1 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
2010-05-12 07:56:49 -07:00
Scott Main
920edfca5f 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
2010-05-12 07:56:45 -07:00
Scott Main
7aab2e4f19 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
2010-05-12 07:56:40 -07:00
Xavier Ducrohet
964e3ef00d am d9712b69: am b1235a57: Merge "Hide two audio focus methods." into froyo
Merge commit 'd9712b69ce529fbf50b3b837032c1dc40e623381' into kraken

* commit 'd9712b69ce529fbf50b3b837032c1dc40e623381':
  Hide two audio focus methods.
2010-05-12 07:56:29 -07:00
Marco Nelissen
9cafcad31d 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
2010-05-12 07:56:24 -07:00
Dianne Hackborn
d643705c06 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
2010-05-12 07:56:19 -07:00
Scott Main
83029bcb7a 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
2010-05-12 07:56:13 -07:00
Dirk Dougherty
87e85c633f 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.
2010-05-12 07:56:07 -07:00
Scott Main
745ae50509 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
2010-05-12 07:56:01 -07:00
Mike Lockwood
a2740229c8 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.
2010-05-12 07:55:55 -07:00
Andreas Huber
9a77d1f27a 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.
2010-05-12 07:55:48 -07:00
Andreas Huber
21eb0390d1 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)
2010-05-12 07:55:40 -07:00
Costin Manolache
7d3262c5ba am 625de488: am e2055fe4: Merge "Bug 2673557: rename datamessaging" into froyo
Merge commit '625de488973f262e56d3ee6825a8cf1ebaee089b' into kraken

* commit '625de488973f262e56d3ee6825a8cf1ebaee089b':
  Bug 2673557: rename datamessaging
2010-05-12 07:55:32 -07:00
Jean-Michel Trivi
9496e90287 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
2010-05-12 07:55:25 -07:00
Dirk Dougherty
c36408479d am 6d405cfc: am fe089334: Merge "Doc Change: cherry-pick from master. ->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.
2010-05-12 07:55:17 -07:00
Jean-Michel Trivi
8e6e343099 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
2010-05-12 07:55:09 -07:00
Wu-cheng Li
9f379c7d27 am d8c33747: am 78624e41: Add remove method in CameraParameters class.
Merge commit 'd8c33747afbe98e893e0569f3bf45b67a9e8e728' into kraken

* commit 'd8c33747afbe98e893e0569f3bf45b67a9e8e728':
  Add remove method in CameraParameters class.
2010-05-12 07:55:00 -07:00