summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Get rid of warnings when compiled with -Wformat-securityNick Kralevich2010-05-141-19/+19
| | | | Change-Id: Ibd814d894ff0eba26b01932b9865098b7bb26f95
* am d48e0382: am fb473bb6: Merge "Doc change: adjustments for ndk feature ↵Dirk Dougherty2010-05-130-0/+0
|\ | | | | | | | | | | | | | | | | description" into froyo Merge commit 'd48e0382c3db1827ccb79fe912d271d426dd46ad' into kraken * commit 'd48e0382c3db1827ccb79fe912d271d426dd46ad': Doc change: adjustments for ndk feature description
| * am fb473bb6: Merge "Doc change: adjustments for ndk feature description" ↵Dirk Dougherty2010-05-130-0/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | into froyo Merge commit 'fb473bb6118f6b82fdeda443b4fdc4ce31d3ed60' into froyo-plus-aosp * commit 'fb473bb6118f6b82fdeda443b4fdc4ce31d3ed60': Doc change: adjustments for ndk feature description
| | * Merge "Doc change: adjustments for ndk feature description" into froyoDirk Dougherty2010-05-130-0/+0
| | |
* | | am d317edab: am a0711e7b: Doc change: Add compatibility article.Dirk Dougherty2010-05-130-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'd317edabe158312981eb73355f77c36566d89627' into kraken * commit 'd317edabe158312981eb73355f77c36566d89627': Doc change: Add compatibility article.
| * | am a0711e7b: Doc change: Add compatibility article.Dirk Dougherty2010-05-130-0/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit 'a0711e7b3995f4ae3d8b116030c6b3ed13ad2f99' into froyo-plus-aosp * commit 'a0711e7b3995f4ae3d8b116030c6b3ed13ad2f99': Doc change: Add compatibility article.
* | | Merge "Remove dummy surface in CameraSource" into krakenJames Dong2010-05-130-0/+0
|\ \ \
* \ \ \ am b63ea5f7: am c928a11e: Merge "Fix 2672155 Check the code path when ↵Suchi Amalapurapu2010-05-130-0/+0
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | enabling disabling packages." into froyo Merge commit 'b63ea5f784b7862a7ab28e0134f6da47f6275810' into kraken * commit 'b63ea5f784b7862a7ab28e0134f6da47f6275810': Fix 2672155
| * | | am c928a11e: Merge "Fix 2672155 Check the code path when enabling disabling ↵Suchi Amalapurapu2010-05-130-0/+0
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | packages." into froyo Merge commit 'c928a11e34678296511d5ea34582292be7368618' into froyo-plus-aosp * commit 'c928a11e34678296511d5ea34582292be7368618': Fix 2672155
| | * | Merge "Fix 2672155 Check the code path when enabling disabling packages." ↵Suchi Amalapurapu2010-05-130-0/+0
| | | | | | | | | | | | | | | | into froyo
* | | | Merge "Get rid of warnings when compiled with -Wformat-security" into krakenNick Kralevich2010-05-130-0/+0
|\ \ \ \
* \ \ \ \ am b1110149: merge from open-source masterThe Android Open Source Project2010-05-130-0/+0
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b1110149cccc3b99e59ead34ca46e5ac026f6db9' into kraken * commit 'b1110149cccc3b99e59ead34ca46e5ac026f6db9': Use integer for loop counter instead of float New test in FrameworkTest for the VelocityTracker class Preserve '+' in phone numbers imported from SIM.
| * | | | merge from open-source masterThe Android Open Source Project2010-05-130-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Change-Id: I88a580162b34a80d1e3e7987b7a301c253afa0e8
| | * \ \ \ Merge "New test in FrameworkTest for the VelocityTracker class"Jean-Baptiste Queru2010-05-130-0/+0
| | |\ \ \ \
| | * | | | | Merge "Preserve '+' in phone numbers imported from SIM."Jean-Baptiste Queru2010-05-130-0/+0
| | | | | | |
* | | | | | | am a3d5549c: am 098e58da: Use SystemClock.elapsedRealtime in ShutdownThread ↵Mike Lockwood2010-05-130-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | timeout logic Merge commit 'a3d5549c802bc4fbf1e1ca05bc3552db17212036' into kraken * commit 'a3d5549c802bc4fbf1e1ca05bc3552db17212036': Use SystemClock.elapsedRealtime in ShutdownThread timeout logic
| * | | | | | am 098e58da: Use SystemClock.elapsedRealtime in ShutdownThread timeout logicMike Lockwood2010-05-130-0/+0
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '098e58da93f304d7d7791f193c6237870b94989d' into froyo-plus-aosp * commit '098e58da93f304d7d7791f193c6237870b94989d': Use SystemClock.elapsedRealtime in ShutdownThread timeout logic
* | | | | | | Merge "Add FLAG_RERAIN_PHONE_NUMBER_FORMATTING." into krakenJaikumar Ganesh2010-05-130-0/+0
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
* | | | | | | am 28fadef2: am 3c78a1b5: Return a runtime error instead of asserting if the ↵Andreas Huber2010-05-130-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AACDecoder is passed an unsupported config. Merge commit '28fadef2ede2d74e9526266e779553bbd1dc66f4' into kraken * commit '28fadef2ede2d74e9526266e779553bbd1dc66f4': Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config.
| * | | | | | am 3c78a1b5: Return a runtime error instead of asserting if the AACDecoder ↵Andreas Huber2010-05-130-0/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | am 1a3b3d48: merge from open-source masterThe Android Open Source Project2010-05-130-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '1a3b3d48413d9134738c9b457292fb2b71a5dfe4' into kraken * commit '1a3b3d48413d9134738c9b457292fb2b71a5dfe4': Add some documentation about the thread safety of Cursor and some of the SQLite* classes.
| * | | | | | merge from open-source masterThe Android Open Source Project2010-05-130-0/+0
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | Change-Id: I51b4eccfde8e74c69ab8e0c051bb8ea718ee7101
* | | | | | | Merge "Fix issue 2678048: binder death detection in AudioFlinger is broken." ↵Eric Laurent2010-05-122-35/+89
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into kraken
| * | | | | | | Fix issue 2678048: binder death detection in AudioFlinger is broken.Eric Laurent2010-05-122-35/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a bug in the way notification client list is managed when the client binder interface dies that makes that the dead client is not removed from the list: the week reference passed by binderDied() cannot be promoted and compared to the strong references in the list. The fix consists in creating a new NotificationClient class that implements the binder DeathRecipient and holds a strong reference to the IAudioFlingerClient interface. A new instance of this class is created for each cient and a strong reference to this object is added to the notification client list maintained by AudioFlinger. When binderDied() is called on this object, it is removed from the list preventing AudioFlinger to notify this client for further io changes. Also added code to disable LifeVibes effects when the client that has enabled the enhancements dies. Change-Id: Icedc4af171759e9ae9a575d82d44784b4e8267e8
* | | | | | | | Merge "Several fixes in AudioDumpInterface:" into krakenEric Laurent2010-05-122-93/+139
|\ \ \ \ \ \ \ \
| * | | | | | | | Several fixes in AudioDumpInterface:Eric Laurent2010-05-122-93/+139
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | | | | | | am fa2e3dcd: am 8ea9f130: Merge "Bug 2680071: Rename the Cloud to Device" ↵Costin Manolache2010-05-121-1/+1
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into froyo Merge commit 'fa2e3dcd855f573e160dbf258fd60a172b6e3f02' into kraken * commit 'fa2e3dcd855f573e160dbf258fd60a172b6e3f02': Bug 2680071: Rename the Cloud to Device
| * | | | | | | am 8ea9f130: Merge "Bug 2680071: Rename the Cloud to Device" into froyoCostin Manolache2010-05-121-1/+1
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '8ea9f130d24a7dd1e505ba0cf437bdd8a660975e' into froyo-plus-aosp * commit '8ea9f130d24a7dd1e505ba0cf437bdd8a660975e': Bug 2680071: Rename the Cloud to Device
| | * | | | | | Merge "Bug 2680071: Rename the Cloud to Device" into froyoCostin Manolache2010-05-121-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | Bug 2680071: Rename the Cloud to DeviceCostin Manolache2010-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I12ab32de393e44a499e3f9e3a0b38f4682156ff5
* | | | | | | | | another attempt at fixing the buildMathias Agopian2010-05-121-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I80b498d1bbb8f9ffcec4f27802be7ae9977f70ac
* | | | | | | | | Merge "SharedBufferStack now can grow up to 16 buffers." into krakenMathias Agopian2010-05-1210-9/+221
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | SharedBufferStack now can grow up to 16 buffers.Mathias Agopian2010-05-1210-9/+221
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | there is a new resize() api, which currently only allows growing. Change-Id: Ia37b81b73be466d2491ffed7f3a23cd8e113c6fe
* | | | | | | | | | Merge "Refactor some code in surfaceflinger in preparation of upcoming ↵Mathias Agopian2010-05-1210-366/+555
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | changes" into kraken
| * | | | | | | | | Refactor some code in surfaceflinger in preparation of upcoming changesMathias Agopian2010-05-1210-366/+555
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | Merge "remove the "memcpy" hack" into krakenMathias Agopian2010-05-124-110/+7
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | remove the "memcpy" hackMathias Agopian2010-05-124-110/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | am c99c401d: am 38b523af: Merge "docs: add missing path-permissions ↵Scott Main2010-05-120-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | document" into froyo Merge commit 'c99c401d93f94d4243ed8cdd5fec101efc9ee265' into kraken * commit 'c99c401d93f94d4243ed8cdd5fec101efc9ee265': docs: add missing path-permissions document
| * | | | | | | | am 38b523af: Merge "docs: add missing path-permissions document" into froyoScott Main2010-05-120-0/+0
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '38b523af5c233dd5f8631ada2cd80b2d75b0efde' into froyo-plus-aosp * commit '38b523af5c233dd5f8631ada2cd80b2d75b0efde': docs: add missing path-permissions document
| | * | | | | | | Merge "docs: add missing path-permissions document" into froyoScott Main2010-05-120-0/+0
| | |\ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ am 8b27c965: am f0e4ae56: Merge "docs: fix broken links" into froyoScott Main2010-05-120-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '8b27c965c8a4cb8ceb4b50484d55270758703768' into kraken * commit '8b27c965c8a4cb8ceb4b50484d55270758703768': docs: fix broken links
| * | | | | | | | | am f0e4ae56: Merge "docs: fix broken links" into froyoScott Main2010-05-120-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'f0e4ae563228db584041d517672aeadacecba61f' into froyo-plus-aosp * commit 'f0e4ae563228db584041d517672aeadacecba61f': docs: fix broken links
| | * | | | | | | | Merge "docs: fix broken links" into froyoScott Main2010-05-120-0/+0
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
* | | | | | | | | | am bfc63c7b: am 336d7dcb: The default AlertDialog allows cancel. But the ↵Grace Kloba2010-05-120-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | am 336d7dcb: The default AlertDialog allows cancel. But the default JSConfim ↵Grace Kloba2010-05-120-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | am 79090cb3: merge from open-source masterThe Android Open Source Project2010-05-120-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '79090cb3da132d07cd3888ef9242df9872fb4aa1' into kraken * commit '79090cb3da132d07cd3888ef9242df9872fb4aa1': Change license for the UUS Information file. Remove ProximityAlerts Receiver when last ProximityAlert expires.
| * | | | | | | | | merge from open-source masterThe Android Open Source Project2010-05-120-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | Change-Id: Ifb008642faddf6b83769cdaa5bd67d21591b9eaa
| | * | | | | | | | Merge "Corrected repeat count for key repeat in input device."Dianne Hackborn2010-05-110-0/+0
| | |\ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ am 4adacd23: merge from open-source masterThe Android Open Source Project2010-05-120-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '4adacd23d4c91569b16fe50419f1a91f68d805bd' into kraken * commit '4adacd23d4c91569b16fe50419f1a91f68d805bd': Add support for EVDO Rev B
| * | | | | | | | | | merge from open-source masterThe Android Open Source Project2010-05-120-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | Change-Id: If6730b50627b2231bd345e594d8d30a37557849e