OSDN Git Service
Andreas Huber [Fri, 14 May 2010 23:30:29 +0000 (16:30 -0700)]
am
a5cd816c: am
eb9128f9: Fix sampleTable instantiation, this makes sure that the sample table refers to the custom datasource that caches the metadata to prevent needless seeking.
Merge commit '
a5cd816c720ed87b91a33aa5d000a0d308c74453' into kraken
* commit '
a5cd816c720ed87b91a33aa5d000a0d308c74453':
Fix sampleTable instantiation, this makes sure that the sample table refers to the custom datasource that caches the metadata to prevent needless seeking.
Andreas Huber [Fri, 14 May 2010 23:28:09 +0000 (16:28 -0700)]
am
eb9128f9: Fix sampleTable instantiation, this makes sure that the sample table refers to the custom datasource that caches the metadata to prevent needless seeking.
Merge commit '
eb9128f9b0ee660504621381fd96f82d5bf8a3fd' into froyo-plus-aosp
* commit '
eb9128f9b0ee660504621381fd96f82d5bf8a3fd':
Fix sampleTable instantiation, this makes sure that the sample table refers to the custom datasource that caches the metadata to prevent needless seeking.
Nick Kralevich [Fri, 14 May 2010 22:28:09 +0000 (15:28 -0700)]
Merge "Get rid of warnings when compiled with -Wformat-security" into kraken
The Android Open Source Project [Fri, 14 May 2010 22:12:17 +0000 (15:12 -0700)]
am
900b6157: merge from open-source master
Merge commit '
900b6157f5dee2ed7b2c73cf320b2baf293230ff' into kraken
* commit '
900b6157f5dee2ed7b2c73cf320b2baf293230ff':
Only hold a weak pointer on SurfaceComposerClients
The Android Open Source Project [Fri, 14 May 2010 22:04:52 +0000 (15:04 -0700)]
merge from open-source master
Change-Id: I0249c6d796b35af9ba08cbccd463a1f5cf779ecd
Scott Main [Fri, 14 May 2010 21:26:14 +0000 (14:26 -0700)]
am
fb580943: am
826c9f77: docs: fix broken link, reduce API info about backup and point to dev guide
Merge commit '
fb580943133d3e9ad3e342b8038726b04686f283' into kraken
* commit '
fb580943133d3e9ad3e342b8038726b04686f283':
docs: fix broken link, reduce API info about backup and point to dev guide
Scott Main [Fri, 14 May 2010 21:24:44 +0000 (14:24 -0700)]
am
826c9f77: docs: fix broken link, reduce API info about backup and point to dev guide
Merge commit '
826c9f7773188c2a7f48d5b2d1ae4612ec2bbb49' into froyo-plus-aosp
* commit '
826c9f7773188c2a7f48d5b2d1ae4612ec2bbb49':
docs: fix broken link, reduce API info about backup and point to dev guide
Dirk Dougherty [Fri, 14 May 2010 21:01:59 +0000 (14:01 -0700)]
am
0d54b806: am
60026c3a: Merge "Doc change: adjust compatibility doc." into froyo
Merge commit '
0d54b806c62cbe3ae71ce21f5d8bad78b0bee279' into kraken
* commit '
0d54b806c62cbe3ae71ce21f5d8bad78b0bee279':
Doc change: adjust compatibility doc.
Dirk Dougherty [Fri, 14 May 2010 21:00:12 +0000 (14:00 -0700)]
am
60026c3a: Merge "Doc change: adjust compatibility doc." into froyo
Merge commit '
60026c3ab0093e6d4cd464061ab9f36d4d041532' into froyo-plus-aosp
* commit '
60026c3ab0093e6d4cd464061ab9f36d4d041532':
Doc change: adjust compatibility doc.
Dirk Dougherty [Fri, 14 May 2010 20:58:12 +0000 (13:58 -0700)]
Merge "Doc change: adjust compatibility doc." into froyo
The Android Open Source Project [Fri, 14 May 2010 20:54:56 +0000 (13:54 -0700)]
am
55b7d124: merge from open-source master
Merge commit '
55b7d1243f15395a102971e8fdc57444638729ac' into kraken
* commit '
55b7d1243f15395a102971e8fdc57444638729ac':
SetLocaleByCarrier, only if its not an unknown carrier.
The Android Open Source Project [Fri, 14 May 2010 20:52:52 +0000 (13:52 -0700)]
merge from open-source master
Change-Id: I3e36061d7ba4b8a3962bf8391d663b861a4ede38
Dirk Dougherty [Fri, 14 May 2010 20:49:56 +0000 (13:49 -0700)]
am
3d52305f: am
59cfe713: Merge "Doc change: adjustments to the api changes description" into froyo
Merge commit '
3d52305faa682366eb34c30892ddd2b390940048' into kraken
* commit '
3d52305faa682366eb34c30892ddd2b390940048':
Doc change: adjustments to the api changes description
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
Dirk Dougherty [Fri, 14 May 2010 20:47:07 +0000 (13:47 -0700)]
am
cae9cfee: am
bba70cdb: Merge "Doc change: add note about future instruction set support." into froyo
Merge commit '
cae9cfeed7b0895189e08a4fadf63c917b1aec7b' into kraken
* commit '
cae9cfeed7b0895189e08a4fadf63c917b1aec7b':
Doc change: add note about future instruction set support.
Dirk Dougherty [Fri, 14 May 2010 20:46:42 +0000 (13:46 -0700)]
Merge "Doc change: adjustments to the api changes description" into froyo
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.
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
Dirk Dougherty [Fri, 14 May 2010 20:41:46 +0000 (13:41 -0700)]
am
bf4cecd2: am
89969d4c: Merge "Doc change: documentation for library projects in sdk." into froyo
Merge commit '
bf4cecd2822ff74c8c246d2595a836b5f1130ad8' into kraken
* commit '
bf4cecd2822ff74c8c246d2595a836b5f1130ad8':
Doc change: documentation for library projects in sdk.
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.
Jean-Baptiste Queru [Fri, 14 May 2010 20:39:48 +0000 (13:39 -0700)]
Merge "Only hold a weak pointer on SurfaceComposerClients"
Dirk Dougherty [Fri, 14 May 2010 20:38:20 +0000 (13:38 -0700)]
Merge "Doc change: documentation for library projects in sdk." into froyo
James Dong [Fri, 14 May 2010 19:19:17 +0000 (12:19 -0700)]
Merge "Detect and handle premature termination of a recording session" into kraken
Nick Kralevich [Fri, 14 May 2010 19:07:05 +0000 (12:07 -0700)]
Merge "Forgot to fix one -Wformat-security in my previous change. Fixed." into kraken
Chih-Chung Chang [Fri, 14 May 2010 19:05:06 +0000 (12:05 -0700)]
Merge "Fix deadlock if the last reference of ICameraClient is removed in ICamera::connect()" into kraken
Scott Main [Fri, 14 May 2010 18:56:14 +0000 (11:56 -0700)]
am
6d8e4fd8: am
b83a283a: docs: add dev guide for backup
Merge commit '
6d8e4fd83bb7f4eabc942dd17fa229cf9baf5fcf' into kraken
* commit '
6d8e4fd83bb7f4eabc942dd17fa229cf9baf5fcf':
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
Ray Chen [Fri, 14 May 2010 18:48:45 +0000 (11:48 -0700)]
Merge "Fix issue
2622023 Clean up all hardcoded '/sdcard' in camera related codes." into kraken
Jean-Baptiste Queru [Fri, 14 May 2010 18:39:06 +0000 (11:39 -0700)]
Merge "SetLocaleByCarrier, only if its not an unknown carrier."
Nick Kralevich [Fri, 14 May 2010 17:29:13 +0000 (10:29 -0700)]
Forgot to fix one -Wformat-security in my previous change. Fixed.
Change-Id: Ice7459b30e1d7dbfe400b68d27ebc04fcca78bae
The Android Open Source Project [Fri, 14 May 2010 16:46:11 +0000 (09:46 -0700)]
am
1d628c5d: merge from open-source master
Merge commit '
1d628c5d3dd7998b29c339292a2dc391015d0782' into kraken
* commit '
1d628c5d3dd7998b29c339292a2dc391015d0782':
Accept media files by file extension in case insensitive manner.
The Android Open Source Project [Fri, 14 May 2010 16:44:36 +0000 (09:44 -0700)]
merge from open-source master
Change-Id: I934cf85c4673f9ca3a9549c2074907ad572310f4
Eric Laurent [Fri, 14 May 2010 16:39:12 +0000 (09:39 -0700)]
Merge "AudioFlinger: rename variables to clarify reference to track channel count or channel mask" into kraken
Nick Kralevich [Fri, 14 May 2010 16:32:45 +0000 (09:32 -0700)]
Merge "Remove libdrm2. This code appears to be unused." into kraken
The Android Open Source Project [Fri, 14 May 2010 16:15:41 +0000 (09:15 -0700)]
am
9167ba50: merge from open-source master
Merge commit '
9167ba50e4d7e08e02119d9c4a0f0392296cc3f1' into kraken
* commit '
9167ba50e4d7e08e02119d9c4a0f0392296cc3f1':
Corrected debug message in WindowManager
Put the wifi status icon in the right place.
The Android Open Source Project [Fri, 14 May 2010 16:11:31 +0000 (09:11 -0700)]
merge from open-source master
Change-Id: I57f108d2b3415eddb0b20a4a9dec4c44285de226
Nick Kralevich [Thu, 13 May 2010 22:09:03 +0000 (15:09 -0700)]
Get rid of warnings when compiled with -Wformat-security
Change-Id: Ibd814d894ff0eba26b01932b9865098b7bb26f95
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."
Eric Laurent [Fri, 14 May 2010 12:45:46 +0000 (05:45 -0700)]
AudioFlinger: rename variables to clarify reference to track channel count or channel mask
Some variables and structure members should be renamed to reflect the fact that they contain the
number of channels in a track (channel count) or the actual channels used by a track (channel mask).
Especially member "channels" of track control block (struct audio_track_cblk_t) is actually the
number of channels (channels count).
Change-Id: I220c8dede9fc00c8a5693389e790073b6ed307b8
Dirk Dougherty [Fri, 14 May 2010 04:34:31 +0000 (21:34 -0700)]
am
d48e0382: am
fb473bb6: Merge "Doc change: adjustments for ndk feature description" into froyo
Merge commit '
d48e0382c3db1827ccb79fe912d271d426dd46ad' into kraken
* commit '
d48e0382c3db1827ccb79fe912d271d426dd46ad':
Doc change: adjustments for ndk feature description
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
Dirk Dougherty [Fri, 14 May 2010 04:31:10 +0000 (21:31 -0700)]
Merge "Doc change: adjustments for ndk feature description" into froyo
Dirk Dougherty [Fri, 14 May 2010 04:28:34 +0000 (21:28 -0700)]
am
d317edab: am
a0711e7b: Doc change: Add compatibility article.
Merge commit '
d317edabe158312981eb73355f77c36566d89627' into kraken
* commit '
d317edabe158312981eb73355f77c36566d89627':
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.
James Dong [Thu, 13 May 2010 23:40:19 +0000 (16:40 -0700)]
Merge "Remove dummy surface in CameraSource" into kraken
Joe Onorato [Thu, 13 May 2010 23:33:22 +0000 (16:33 -0700)]
Merge "Put the wifi status icon in the right place."
Suchi Amalapurapu [Thu, 13 May 2010 23:05:54 +0000 (16:05 -0700)]
am
b63ea5f7: am
c928a11e: Merge "Fix
2672155 Check the code path when enabling disabling packages." into froyo
Merge commit '
b63ea5f784b7862a7ab28e0134f6da47f6275810' into kraken
* commit '
b63ea5f784b7862a7ab28e0134f6da47f6275810':
Fix
2672155
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
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
Nick Kralevich [Thu, 13 May 2010 22:35:48 +0000 (15:35 -0700)]
Merge "Get rid of warnings when compiled with -Wformat-security" into kraken
The Android Open Source Project [Thu, 13 May 2010 21:56:02 +0000 (14:56 -0700)]
am
b1110149: merge from open-source master
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.
The Android Open Source Project [Thu, 13 May 2010 21:50:16 +0000 (14:50 -0700)]
merge from open-source master
Change-Id: I88a580162b34a80d1e3e7987b7a301c253afa0e8
Mike Lockwood [Thu, 13 May 2010 21:06:25 +0000 (14:06 -0700)]
am
a3d5549c: am
098e58da: Use SystemClock.elapsedRealtime in ShutdownThread timeout logic
Merge commit '
a3d5549c802bc4fbf1e1ca05bc3552db17212036' into kraken
* commit '
a3d5549c802bc4fbf1e1ca05bc3552db17212036':
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
Dianne Hackborn [Thu, 13 May 2010 20:25:16 +0000 (13:25 -0700)]
Merge "Corrected debug message in WindowManager"
Jaikumar Ganesh [Thu, 13 May 2010 19:20:06 +0000 (12:20 -0700)]
Merge "Add FLAG_RERAIN_PHONE_NUMBER_FORMATTING." into kraken
Jean-Baptiste Queru [Thu, 13 May 2010 18:39:51 +0000 (11:39 -0700)]
Merge "New test in FrameworkTest for the VelocityTracker class"
Andreas Huber [Thu, 13 May 2010 18:18:24 +0000 (11:18 -0700)]
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.
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.
Jean-Baptiste Queru [Thu, 13 May 2010 18:06:28 +0000 (11:06 -0700)]
Merge "Preserve '+' in phone numbers imported from SIM."
The Android Open Source Project [Thu, 13 May 2010 16:53:16 +0000 (09:53 -0700)]
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.
The Android Open Source Project [Thu, 13 May 2010 16:04:45 +0000 (09:04 -0700)]
merge from open-source master
Change-Id: I51b4eccfde8e74c69ab8e0c051bb8ea718ee7101
Eric Laurent [Thu, 13 May 2010 06:40:28 +0000 (23:40 -0700)]
Merge "Fix issue
2678048: binder death detection in AudioFlinger is broken." into kraken
Eric Laurent [Thu, 13 May 2010 06:21:42 +0000 (23:21 -0700)]
Merge "Several fixes in AudioDumpInterface:" into kraken
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
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
Costin Manolache [Thu, 13 May 2010 02:04:27 +0000 (19:04 -0700)]
Merge "Bug
2680071: Rename the Cloud to Device" into froyo
Mathias Agopian [Thu, 13 May 2010 01:37:43 +0000 (18:37 -0700)]
another attempt at fixing the build
Change-Id: I80b498d1bbb8f9ffcec4f27802be7ae9977f70ac
Mathias Agopian [Thu, 13 May 2010 00:36:46 +0000 (17:36 -0700)]
Merge "SharedBufferStack now can grow up to 16 buffers." into kraken
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
Mathias Agopian [Thu, 13 May 2010 00:35:12 +0000 (17:35 -0700)]
Merge "remove the "memcpy" hack" into kraken
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
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
Costin Manolache [Wed, 12 May 2010 23:04:10 +0000 (16:04 -0700)]
Bug
2680071: Rename the Cloud to Device
Change-Id: I12ab32de393e44a499e3f9e3a0b38f4682156ff5
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
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
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
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
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
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
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
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.
Scott Main [Wed, 12 May 2010 22:01:30 +0000 (15:01 -0700)]
Merge "docs: add missing path-permissions document" into froyo
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
Kenny Root [Wed, 12 May 2010 21:54:42 +0000 (14:54 -0700)]
Merge "ZipUtilsRO rewrite based on Dalvik Zip rewrite" into kraken
The Android Open Source Project [Wed, 12 May 2010 21:54:38 +0000 (14:54 -0700)]
merge from open-source master
Change-Id: Ifb008642faddf6b83769cdaa5bd67d21591b9eaa
Scott Main [Wed, 12 May 2010 21:53:35 +0000 (14:53 -0700)]
Merge "docs: fix broken links" into froyo
The Android Open Source Project [Wed, 12 May 2010 21:53:25 +0000 (14:53 -0700)]
merge from open-source master
Change-Id: If6730b50627b2231bd345e594d8d30a37557849e
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)
The Android Open Source Project [Wed, 12 May 2010 21:39:38 +0000 (14:39 -0700)]
merge from open-source master
Change-Id: Ib092e6ae5151bbcdf56b9b3a7adbaee7bb5df8b5
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
The Android Open Source Project [Wed, 12 May 2010 21:10:23 +0000 (14:10 -0700)]
merge from open-source master
Change-Id: Ib5ea9745c2b652d64646e3e28c12e63815321ff9
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.
The Android Open Source Project [Wed, 12 May 2010 19:33:35 +0000 (12:33 -0700)]
merge from open-source master
Change-Id: I24ecfac151c0ddc27237d711c95b8fe488d7931b
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.
The Android Open Source Project [Wed, 12 May 2010 18:58:14 +0000 (11:58 -0700)]
merge from open-source master
Change-Id: I022d0781a232396e2b8a67a420ecf50e64b87d8c
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.
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.
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
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