Commit Graph

4703 Commits

Author SHA1 Message Date
Grace Kloba
f28ef592aa am d82bc515: Avoid the rounding error, as Math.round(Math.round(viewWidth * mInvActualScale) * mActualScale) not necessary to be viewWidth, we special case when the content exactly fit in the view case.
Merge commit 'd82bc5158c764bdd30b7d22f32258ad3c2c0c0f6' into eclair-plus-aosp

* commit 'd82bc5158c764bdd30b7d22f32258ad3c2c0c0f6':
  Avoid the rounding error, as Math.round(Math.round(viewWidth * mInvActualScale) * mActualScale) not necessary to be viewWidth, we special case when the content exactly fit in the view case.
2009-09-09 14:02:05 -07:00
Leon Scroggins
a382afebc6 am f416264a: Merge change 24398 into eclair
Merge commit 'f416264a3b13c5965bfe1c75e9fb2a480d556f87' into eclair-plus-aosp

* commit 'f416264a3b13c5965bfe1c75e9fb2a480d556f87':
  Adjust the WebTextView's text size according to density.
2009-09-09 14:02:01 -07:00
Android (Google) Code Review
ac997bd50f Merge change 24398 into eclair
* changes:
  Adjust the WebTextView's text size according to density.
2009-09-09 16:22:16 -04:00
Romain Guy
8674c7a6f2 am d380586a: Merge change 24413 into eclair
Merge commit 'd380586ac19903145e23ad3a8d073f01b4fe1192' into eclair-plus-aosp

* commit 'd380586ac19903145e23ad3a8d073f01b4fe1192':
  Remove the FallRS demo, now promoted as a wallpaper.
2009-09-09 13:19:49 -07:00
Android (Google) Code Review
a68c9b8ec2 Merge change 24413 into eclair
* changes:
  Remove the FallRS demo, now promoted as a wallpaper.
2009-09-09 16:11:30 -04:00
Nick Pelly
31c4b1b713 am 41140098: Merge change 24274 into eclair
Merge commit '411400980720895c4195c71e181831bc771a5a7b' into eclair-plus-aosp

* commit '411400980720895c4195c71e181831bc771a5a7b':
  API_CHANGE
2009-09-09 11:39:22 -07:00
Nick Pelly
445330bb04 am aadc9220: Merge change 24202 into eclair
Merge commit 'aadc9220bd04ba8dd016fe634fabf6c91a1ce672' into eclair-plus-aosp

* commit 'aadc9220bd04ba8dd016fe634fabf6c91a1ce672':
  API_CHANGE
2009-09-09 11:39:16 -07:00
Android (Google) Code Review
7863838310 Merge change 24274 into eclair
* changes:
  API_CHANGE
2009-09-09 14:34:44 -04:00
Android (Google) Code Review
62bfa41b3d Merge change 24202 into eclair
* changes:
  API_CHANGE
2009-09-09 14:30:15 -04:00
Andreas Huber
709cec1e02 am 201511cf: Calculate proper output buffer size for some more 16-bit RGB color spaces.
Merge commit '201511cf8a004d386ec9f592041ad3e3d4107184' into eclair-plus-aosp

* commit '201511cf8a004d386ec9f592041ad3e3d4107184':
  Calculate proper output buffer size for some more 16-bit RGB color spaces.
2009-09-09 11:29:43 -07:00
Andreas Huber
919374a7a0 am 5a65a6e2: Added a .amr file extractor (for AMR-NB and AMR-WB content).
Merge commit '5a65a6e22017e51ebcebb0f41510c54f1085f82c' into eclair-plus-aosp

* commit '5a65a6e22017e51ebcebb0f41510c54f1085f82c':
  Added a .amr file extractor (for AMR-NB and AMR-WB content).
2009-09-09 11:25:11 -07:00
Andreas Huber
0c33f5022e am 4e60d7e6: Merge change 24179 into eclair
Merge commit '4e60d7e60b29c42c6745dd23ff90dced8834fa7c' into eclair-plus-aosp

* commit '4e60d7e60b29c42c6745dd23ff90dced8834fa7c':
  Support encoding amr-wb content in stagefright.
2009-09-09 11:02:33 -07:00
Android (Google) Code Review
d838e6e18a Merge change 24179 into eclair
* changes:
  Support encoding amr-wb content in stagefright.
2009-09-09 13:55:48 -04:00
Jaikumar Ganesh
33c102bf6f am 100f0861: Merge change 24376 into eclair
Merge commit '100f08613392c225b8dff3f1e1d586f981884e29' into eclair-plus-aosp

* commit '100f08613392c225b8dff3f1e1d586f981884e29':
  Query for all properties if a property change is received and cache is empty.
2009-09-09 10:55:14 -07:00
Android (Google) Code Review
bbc2ce25ef Merge change 24376 into eclair
* changes:
  Query for all properties if a property change is received and cache is empty.
2009-09-09 13:47:27 -04:00
Andrei Popescu
d6ca68dd40 am cf7b5521: Remove the call to nativeAddJavascriptInterface() from BrowserFrame::addJavascriptInterface() as it causes an intermitent crash.
Merge commit 'cf7b5521fc4a8f87033e3bf3626e8a2cf81fccfd' into eclair-plus-aosp

* commit 'cf7b5521fc4a8f87033e3bf3626e8a2cf81fccfd':
  Remove the call to nativeAddJavascriptInterface() from BrowserFrame::addJavascriptInterface() as it causes an intermitent crash.
2009-09-09 10:16:18 -07:00
Grace Kloba
30814a5ea4 am ccda4c49: Merge change 24288 into eclair
Merge commit 'ccda4c4960ad6694e506e075f8f0b479ea2bafb6' into eclair-plus-aosp

* commit 'ccda4c4960ad6694e506e075f8f0b479ea2bafb6':
  Do not cache POST response as Cache is indexed with url.
2009-09-09 09:00:07 -07:00
Android (Google) Code Review
4460e66487 Merge change 24288 into eclair
* changes:
  Do not cache POST response as Cache is indexed with url.
2009-09-09 11:55:03 -04:00
Andy McFadden
97fefb45df am b9e52a07: Fix sim-eng build.
Merge commit 'b9e52a07b7a605fe6d6588587bc74002f632c768' into eclair-plus-aosp

* commit 'b9e52a07b7a605fe6d6588587bc74002f632c768':
  Fix sim-eng build.
2009-09-09 08:47:04 -07:00
Andy McFadden
e0a963b72e Fix sim-eng build.
Appears to have been broken by:

commit 9779b221e999583ff89e0dfc40e56398737adbb3
Author: Mathias Agopian <mathias@google.com>
Date:   Mon Sep 7 16:32:45 2009 -0700

    fix [2068105] implement queueBuffer/lockBuffer/dequeueBuffer properly

For some reason we don't like to have "-lpthread" globally -- it's a no-op
on device builds, but required for many host tools and all sim binaries --
so adding the use of pthread calls requires adding the library explicitly.
2009-09-09 08:02:54 -07:00
Eric Laurent
6ad8c64ce9 Fix issue 2107584: media server crash when AudioFlinger fails to allocate memory for track control block.
AudioFlinger: verify that mCblk is not null before using it in Track and RecordTrack contructors.
IAudioFlinger: check result of remote transaction before reading IAudioTrack and IAudioRecord.
IAudioTrack and IAudioRecord: check result of remote transaction before reading IMemory.
2009-09-09 05:16:08 -07:00
Mathias Agopian
c8e87684d1 am 11c803ac: Merge change 24335 into eclair
Merge commit '11c803ac77b6a9b815180b4649a700361d3b8cfe' into eclair-plus-aosp

* commit '11c803ac77b6a9b815180b4649a700361d3b8cfe':
  use broadcast() instead of signal() when signaling the condition-variable Thread::RequestExitAndWait() is waiting for
2009-09-09 03:32:09 -07:00
Mathias Agopian
dcbd95b874 am 72e2d6da: Merge change 24334 into eclair
Merge commit '72e2d6da79a2fc3b5346c02ed40b9335c1eb78fa' into eclair-plus-aosp

* commit '72e2d6da79a2fc3b5346c02ed40b9335c1eb78fa':
  fix [2037525] Fail to start camera after adb sync new Camera
2009-09-09 03:32:06 -07:00
Mathias Agopian
674ef96f69 am 0a5bf257: Merge change 24333 into eclair
Merge commit '0a5bf25765cc884aba8d417d8a85f985c5ff3b5a' into eclair-plus-aosp

* commit '0a5bf25765cc884aba8d417d8a85f985c5ff3b5a':
  rename Mutexes to make the code easier to follow
2009-09-09 03:32:02 -07:00
Android (Google) Code Review
1f5105cf53 Merge change 24335 into eclair
* changes:
  use broadcast() instead of signal() when signaling the condition-variable Thread::RequestExitAndWait() is waiting for
2009-09-09 03:29:19 -07:00
Android (Google) Code Review
42c3c9a8d1 Merge change 24334 into eclair
* changes:
  fix [2037525] Fail to start camera after adb sync new Camera
2009-09-09 03:29:08 -07:00
Android (Google) Code Review
0ee8522ffa Merge change 24333 into eclair
* changes:
  rename Mutexes to make the code easier to follow
2009-09-09 03:28:47 -07:00
Mathias Agopian
4de4ebf6a2 use broadcast() instead of signal() when signaling the condition-variable Thread::RequestExitAndWait() is waiting for
we could have several thread waiting on the condition and they all need to wake-up.
also added a debug "mTid" field in the class, which contains the tid of the thread (as opposed to pthread_t), this
is useful when debugging under gdb for instance.
2009-09-09 02:45:26 -07:00
Mathias Agopian
454ea68139 fix [2037525] Fail to start camera after adb sync new Camera
we ended-up locking a Mutex that had been destroyed.
This happened because we gave an sp<Source> to the outside world,
and were called after LayerBuffer had been destroyed.

Instead we now give a wp<LayerBuffer> to the outside and have it
do the destruction.
2009-09-09 00:50:29 -07:00
Chung-yih Wang
a43cf61a86 am 0c065d9e: Merge change 24117 into eclair
Merge commit '0c065d9ef17ad9e045391bab3630a49fb998250c' into eclair-plus-aosp

* commit '0c065d9ef17ad9e045391bab3630a49fb998250c':
  Replace the delimiter whitespace with '\0'.
2009-09-09 00:41:54 -07:00
Android (Google) Code Review
4982510436 Merge change 24117 into eclair
* changes:
  Replace the delimiter whitespace with '\0'.
2009-09-09 00:40:17 -07:00
Chung-yih Wang
2a58b6dbf0 Replace the delimiter whitespace with '\0'.
+ Use '\0' as the delimiter.
+ Allow whitespace character for keystore password.

In previous implementation, we use space as the delimiter. That
will stop user from using passphrase with whitespace character.
2009-09-09 15:00:43 +08:00
Eric Laurent
cdafe89ce9 am db603b0b: Merge change 24114 into eclair
Merge commit 'db603b0b2c7c06ea78b8aa0bdc7ea8f08b335c3d' into eclair-plus-aosp

* commit 'db603b0b2c7c06ea78b8aa0bdc7ea8f08b335c3d':
  Fix issue 1992233: DTMF tones on Sholes is really long.
2009-09-08 23:07:51 -07:00
Android (Google) Code Review
8e375c4097 Merge change 24114 into eclair
* changes:
  Fix issue 1992233: DTMF tones on Sholes is really long.
2009-09-08 23:04:38 -07:00
Tammo Spalink
3ff8660670 am 997eddb0: Merge change 24318 into eclair
Merge commit '997eddb0a0a069ea627e8b07d41d7ffdbc12c53d' into eclair-plus-aosp

* commit '997eddb0a0a069ea627e8b07d41d7ffdbc12c53d':
  Avoid CDMA messages with IDs of zero.
2009-09-08 22:58:52 -07:00
Eric Laurent
3522c80819 Fix issue 1992233: DTMF tones on Sholes is really long.
Add a parameter to ToneGenerator.startTone() allowing the caller to specify the tone duration. This is used by the phone application to have a precise control on the DTMF tone duration which was not possible with the use of delayed messaged.
Also modified AudioFlinger output threads so that 0s are written to the audio output stream when no more tracks are ready to mix instead of just sleeping. This avoids an issue where the end of a previous DTMF tone could stay in audio hardware buffers and be played just before the beginning of the next DTMF tone.
2009-09-08 22:56:07 -07:00
Android (Google) Code Review
38fdabf1b6 Merge change 24318 into eclair
* changes:
  Avoid CDMA messages with IDs of zero.
2009-09-08 22:55:49 -07:00
Mathias Agopian
4d2de2c769 rename Mutexes to make the code easier to follow 2009-09-08 22:48:24 -07:00
Omari Stephens
cb25c6a36b am 948ef29e: Merge change 24316 into eclair
Merge commit '948ef29ebacde30bc2f1283b5e6d86f2413698c4' into eclair-plus-aosp

* commit '948ef29ebacde30bc2f1283b5e6d86f2413698c4':
  Fix typo: IMMEDITATE -> IMMEDIATE
2009-09-08 21:03:48 -07:00
Android (Google) Code Review
e40e550700 Merge change 24316 into eclair
* changes:
  Fix typo: IMMEDITATE -> IMMEDIATE
2009-09-08 21:00:29 -07:00
Tammo Spalink
86cb6633b1 am 0a46e913: Merge change 23414 into eclair
Merge commit '0a46e91357def02cbc6a5449c86763f4350850db' into eclair-plus-aosp

* commit '0a46e91357def02cbc6a5449c86763f4350850db':
  Fix broken GSM SMS unit test, and general cleanup.
2009-09-08 19:43:42 -07:00
Android (Google) Code Review
975d79ec05 Merge change 23414 into eclair
* changes:
  Fix broken GSM SMS unit test, and general cleanup.
2009-09-08 19:41:13 -07:00
Yu Shan Emily Lau
cac9149c06 am bde54df0: modified: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java Fixed the incorrect expected druation
Merge commit 'bde54df0209e6b3db720b14f5c7b8bd6e6372757' into eclair-plus-aosp

* commit 'bde54df0209e6b3db720b14f5c7b8bd6e6372757':
  modified:   tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
2009-09-08 19:03:35 -07:00
Snigdha Sinha
d77818614e CameraService change for OVERLAY_FORMAT_DEFAULT
Originally from: https://partner.source.android.com/g/#change,829
2009-09-08 18:28:15 -07:00
Fred Quintana
997f4911e5 am b0dccf73: Merge change 24012 into eclair
Merge commit 'b0dccf73ddb5a695fe24f1435411feea5876609f' into eclair-plus-aosp

* commit 'b0dccf73ddb5a695fe24f1435411feea5876609f':
  add a transaction monitor
2009-09-08 17:29:09 -07:00
Android (Google) Code Review
ac6dda883e Merge change 24012 into eclair
* changes:
  add a transaction monitor
2009-09-08 17:26:25 -07:00
Eric Fischer
3c0a492208 am 046263ce: Merge change 24220 into eclair
Merge commit '046263ce352912990e492eb5cfd833c21109cf9f' into eclair-plus-aosp

* commit '046263ce352912990e492eb5cfd833c21109cf9f':
  Import revised translations.  DO NOT MERGE
2009-09-08 17:01:11 -07:00
Android (Google) Code Review
d55f91d45a Merge change 24220 into eclair
* changes:
  Import revised translations.  DO NOT MERGE
2009-09-08 16:58:33 -07:00
Yu Shan Emily Lau
6d4a6286a3 am 9bb1101f: Merge change 23924 into eclair
Merge commit '9bb1101f5ccd795265dff1cfa4bb73998ba807ba' into eclair-plus-aosp

* commit '9bb1101f5ccd795265dff1cfa4bb73998ba807ba':
  new file:   LowStorageTest/Android.mk
2009-09-08 16:33:05 -07:00
Android (Google) Code Review
0f8fb9be9c Merge change 23924 into eclair
* changes:
  	new file:   LowStorageTest/Android.mk 	new file:   LowStorageTest/AndroidManifest.xml 	new file:   LowStorageTest/res/layout/main.xml 	new file:   LowStorageTest/res/values/strings.xml 	new file:   LowStorageTest/src/com/android/lowstoragetest/LowStorageTest.java Add the test app which can eat up 100% of the data parition. This is for the low storage test.
2009-09-08 16:30:42 -07:00