Jaikumar Ganesh
0de3cc9b5e
am 54a8f295: Merge "Add FLAG_RERAIN_PHONE_NUMBER_FORMATTING." into kraken
2010-05-13 12:22:05 -07:00
Jaikumar Ganesh
54a8f29523
Merge "Add FLAG_RERAIN_PHONE_NUMBER_FORMATTING." into kraken
2010-05-13 12:20:06 -07:00
Andreas Huber
9df829bf58
am fae47fd0: am 28fadef2: am 3c78a1b5: Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config.
2010-05-13 11:33:06 -07:00
Andreas Huber
fae47fd008
am 28fadef2: am 3c78a1b5: Return a runtime error instead of asserting if the 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.
2010-05-13 11:18:24 -07:00
Andreas Huber
28fadef2ed
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.
2010-05-13 11:16:43 -07:00
The Android Open Source Project
fd5b040ae7
am 485b800e: am 1a3b3d48: merge from open-source master
2010-05-13 09:54:44 -07:00
The Android Open Source Project
485b800eac
am 1a3b3d48: merge from open-source master
...
Merge commit '1a3b3d48413d9134738c9b457292fb2b71a5dfe4' into kraken
* commit '1a3b3d48413d9134738c9b457292fb2b71a5dfe4':
Add some documentation about the thread safety of Cursor and some of the SQLite* classes.
2010-05-13 09:53:16 -07:00
Andreas Huber
3c78a1b589
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
2010-05-13 09:19:35 -07:00
Eric Laurent
06a237b0bd
am ca20104a: Merge "Fix issue 2678048: binder death detection in AudioFlinger is broken." into kraken
2010-05-13 09:17:30 -07:00
Eric Laurent
76a956192b
am c247328d: Merge "Several fixes in AudioDumpInterface:" into kraken
2010-05-13 09:17:23 -07:00
The Android Open Source Project
1a3b3d4841
merge from open-source master
...
Change-Id: I51b4eccfde8e74c69ab8e0c051bb8ea718ee7101
2010-05-13 09:04:45 -07:00
Eric Laurent
ca20104a3a
Merge "Fix issue 2678048: binder death detection in AudioFlinger is broken." into kraken
2010-05-12 23:40:28 -07:00
Eric Laurent
c247328dfd
Merge "Several fixes in AudioDumpInterface:" into kraken
2010-05-12 23:21:42 -07:00
Costin Manolache
0c6028c10a
am c1959658: am fa2e3dcd: am 8ea9f130: Merge "Bug 2680071: Rename the Cloud to Device" into froyo
2010-05-12 19:11:34 -07:00
Costin Manolache
c195965893
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
2010-05-12 19:10:01 -07:00
Costin Manolache
fa2e3dcd85
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
2010-05-12 19:06:39 -07:00
Costin Manolache
8ea9f130d2
Merge "Bug 2680071: Rename the Cloud to Device" into froyo
2010-05-12 19:04:27 -07:00
Mathias Agopian
6b5233dedf
am 75181b42: another attempt at fixing the build
2010-05-12 18:39:33 -07:00
Mathias Agopian
75181b42c9
another attempt at fixing the build
...
Change-Id: I80b498d1bbb8f9ffcec4f27802be7ae9977f70ac
2010-05-12 18:37:43 -07:00
Mathias Agopian
fb6bd833ea
am 7406eafe: should fix the build
2010-05-12 18:29:34 -07:00
Mathias Agopian
7406eafe7f
should fix the build
...
Change-Id: I9957fc43d5fce317479f6c55fb0b9612bff9a495
2010-05-12 18:26:13 -07:00
Mathias Agopian
19f64314c6
am 2f0e6753: Merge "SharedBufferStack now can grow up to 16 buffers." into kraken
2010-05-12 17:38:53 -07:00
Mathias Agopian
2f0e6753d6
Merge "SharedBufferStack now can grow up to 16 buffers." into kraken
2010-05-12 17:36:46 -07:00
Mathias Agopian
e0630ae34e
am 6a70cb8a: Merge "Refactor some code in surfaceflinger in preparation of upcoming changes" into kraken
2010-05-12 17:36:27 -07:00
Mathias Agopian
32286409cf
am ca64ed6a: Merge "remove the "memcpy" hack" into kraken
2010-05-12 17:36:23 -07:00
Mathias Agopian
6a70cb8a38
Merge "Refactor some code in surfaceflinger in preparation of upcoming changes" into kraken
2010-05-12 17:35:24 -07:00
Mathias Agopian
ca64ed6a81
Merge "remove the "memcpy" hack" into kraken
2010-05-12 17:35:12 -07:00
Mathias Agopian
59751dbf7d
SharedBufferStack now can grow up to 16 buffers.
...
there is a new resize() api, which currently only allows growing.
Change-Id: Ia37b81b73be466d2491ffed7f3a23cd8e113c6fe
2010-05-12 17:28:20 -07:00
Mathias Agopian
9f2c4fd9a1
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
Jeff Hamilton
f3ca9a5c7e
Add some documentation about the thread safety of Cursor and some of the SQLite* classes.
...
Change-Id: Icae51052d1c942d7d60bb958d3703411da001079
2010-05-12 16:44:19 -07:00
Costin Manolache
8d83f9e31b
Bug 2680071: Rename the Cloud to Device
...
Change-Id: I12ab32de393e44a499e3f9e3a0b38f4682156ff5
2010-05-12 16:16:34 -07:00
Mathias Agopian
aca2ee8a70
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
c071591cfd
am 8b518577: am c99c401d: am 38b523af: Merge "docs: add missing path-permissions document" into froyo
2010-05-12 15:37:30 -07:00
Scott Main
9a2a8f06f5
am 63768336: am 8b27c965: am f0e4ae56: Merge "docs: fix broken links" into froyo
2010-05-12 15:37:27 -07:00
Grace Kloba
d4ef297311
am 2fb3b394: 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.
2010-05-12 15:37:22 -07:00
Scott Main
8b518577ce
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
6376833687
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
2fb3b394fb
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
c99c401d93
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
8b27c965c8
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
bfc63c7b83
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
35b1184339
am 1f35de2a: am 79090cb3: merge from open-source master
2010-05-12 15:08:06 -07:00
The Android Open Source Project
1f35de2a2e
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
38b523af5c
Merge "docs: add missing path-permissions document" into froyo
2010-05-12 15:01:31 -07:00
The Android Open Source Project
7cd6ca9ba8
am d6e24ca2: am 4adacd23: merge from open-source master
2010-05-12 14:57:51 -07:00
The Android Open Source Project
d6e24ca28b
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
d6effb0696
am e8621534: Merge "ZipUtilsRO rewrite based on Dalvik Zip rewrite" into kraken
2010-05-12 14:55:56 -07:00
Kenny Root
e8621534db
Merge "ZipUtilsRO rewrite based on Dalvik Zip rewrite" into kraken
2010-05-12 14:54:42 -07:00
The Android Open Source Project
79090cb3da
merge from open-source master
...
Change-Id: Ifb008642faddf6b83769cdaa5bd67d21591b9eaa
2010-05-12 14:54:38 -07:00
Scott Main
f0e4ae5632
Merge "docs: fix broken links" into froyo
2010-05-12 14:53:35 -07:00
