8252 Commits

Author SHA1 Message Date
Andreas Huber
75a201626d am e180af03: am 201511cf: Calculate proper output buffer size for some more 16-bit RGB color spaces.
Merge commit 'e180af0335b9423bd7c0d764ac3819bd4ee88d37'

* commit 'e180af0335b9423bd7c0d764ac3819bd4ee88d37':
  Calculate proper output buffer size for some more 16-bit RGB color spaces.
2009-09-09 16:28:13 -07:00
Andreas Huber
d59e166efe am 13a26677: am 5a65a6e2: Added a .amr file extractor (for AMR-NB and AMR-WB content).
Merge commit '13a26677816cf2b66b34eab2cedb0cdfe541a17c'

* commit '13a26677816cf2b66b34eab2cedb0cdfe541a17c':
  Added a .amr file extractor (for AMR-NB and AMR-WB content).
2009-09-09 16:28:05 -07:00
Andreas Huber
364eedd318 am 022ed17c: am 4e60d7e6: Merge change 24179 into eclair
Merge commit '022ed17cddb0bfb47e587e9b0db93f7b342d2b65'

* commit '022ed17cddb0bfb47e587e9b0db93f7b342d2b65':
  Support encoding amr-wb content in stagefright.
2009-09-09 16:28:00 -07:00
Jaikumar Ganesh
80626de799 am b962208d: am 100f0861: Merge change 24376 into eclair
Merge commit 'b962208d8ec529b8cc07c3bc44732603010bd691'

* commit 'b962208d8ec529b8cc07c3bc44732603010bd691':
  Query for all properties if a property change is received and cache is empty.
2009-09-09 16:27:47 -07:00
Andrei Popescu
d2a43c36e4 am 0faff7b0: am cf7b5521: Remove the call to nativeAddJavascriptInterface() from BrowserFrame::addJavascriptInterface() as it causes an intermitent crash.
Merge commit '0faff7b0cc06ffb933763a9494056a8ec132183a'

* commit '0faff7b0cc06ffb933763a9494056a8ec132183a':
  Remove the call to nativeAddJavascriptInterface() from BrowserFrame::addJavascriptInterface() as it causes an intermitent crash.
2009-09-09 16:27:16 -07:00
Grace Kloba
a9af25befb am b84214a3: am ccda4c49: Merge change 24288 into eclair
Merge commit 'b84214a329963be9e156f771c3c8d142280882d7'

* commit 'b84214a329963be9e156f771c3c8d142280882d7':
  Do not cache POST response as Cache is indexed with url.
2009-09-09 16:26:39 -07:00
Andy McFadden
ed61d9ec9e am 894d083e: am b9e52a07: Fix sim-eng build.
Merge commit '894d083ec1bcdc52996fbf3d6cd10823262e47fc'

* commit '894d083ec1bcdc52996fbf3d6cd10823262e47fc':
  Fix sim-eng build.
2009-09-09 16:26:34 -07:00
Mathias Agopian
7151176f86 am 1d9161e2: am 11c803ac: Merge change 24335 into eclair
Merge commit '1d9161e2624e3b2b7e4671dc5be8547a06d35fe8'

* commit '1d9161e2624e3b2b7e4671dc5be8547a06d35fe8':
  use broadcast() instead of signal() when signaling the condition-variable Thread::RequestExitAndWait() is waiting for
2009-09-09 13:42:47 -07:00
Mathias Agopian
88a1f4c25e am 44187ac0: am 72e2d6da: Merge change 24334 into eclair
Merge commit '44187ac07c73dc3ad0d3e9f9da432edffab0829d'

* commit '44187ac07c73dc3ad0d3e9f9da432edffab0829d':
  fix [2037525] Fail to start camera after adb sync new Camera
2009-09-09 13:42:42 -07:00
Mathias Agopian
ab4b4ab913 am dfc6ca96: am 0a5bf257: Merge change 24333 into eclair
Merge commit 'dfc6ca96529319613e744092d7dffeae70bf35e3'

* commit 'dfc6ca96529319613e744092d7dffeae70bf35e3':
  rename Mutexes to make the code easier to follow
2009-09-09 13:42:37 -07:00
Chung-yih Wang
591a16220b am 53fb67a8: am 0c065d9e: Merge change 24117 into eclair
Merge commit '53fb67a8196e75965a5042fdbd83d266980420d9'

* commit '53fb67a8196e75965a5042fdbd83d266980420d9':
  Replace the delimiter whitespace with '\0'.
2009-09-09 13:42:15 -07:00
Eric Laurent
7fae310537 am d3a31996: am db603b0b: Merge change 24114 into eclair
Merge commit 'd3a31996e6ef915bc25ff67f1f35274447a14862'

* commit 'd3a31996e6ef915bc25ff67f1f35274447a14862':
  Fix issue 1992233: DTMF tones on Sholes is really long.
2009-09-09 13:41:53 -07:00
Tammo Spalink
54807f3b5e am e579dc1c: am 997eddb0: Merge change 24318 into eclair
Merge commit 'e579dc1cc55648c3b8b81560214c47c9adee81f1'

* commit 'e579dc1cc55648c3b8b81560214c47c9adee81f1':
  Avoid CDMA messages with IDs of zero.
2009-09-09 13:41:40 -07:00
Omari Stephens
99af2813e0 am c5e15ad7: am 948ef29e: Merge change 24316 into eclair
Merge commit 'c5e15ad767b4ff92d4eb85655b6e5fd517c0ae93'

* commit 'c5e15ad767b4ff92d4eb85655b6e5fd517c0ae93':
  Fix typo: IMMEDITATE -> IMMEDIATE
2009-09-09 13:41:17 -07:00
Andreas Huber
e180af0335 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
13a2667781 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
201511cf8a Calculate proper output buffer size for some more 16-bit RGB color spaces. 2009-09-09 11:24:33 -07:00
Andreas Huber
5a65a6e220 Added a .amr file extractor (for AMR-NB and AMR-WB content). 2009-09-09 11:05:42 -07:00
Andreas Huber
022ed17cdd 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
Tammo Spalink
091ecf7e81 am 71a9687e: am 0a46e913: Merge change 23414 into eclair
Merge commit '71a9687e8baa9ad7ae594e6cb66a14e82d71b237'

* commit '71a9687e8baa9ad7ae594e6cb66a14e82d71b237':
  Fix broken GSM SMS unit test, and general cleanup.
2009-09-09 10:59:36 -07:00
Yu Shan Emily Lau
86b2d7c54d am ec00bcbe: am bde54df0: modified: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java Fixed the incorrect expected druation
Merge commit 'ec00bcbe544c342a6de892a7d5427acfe7579a1a'

* commit 'ec00bcbe544c342a6de892a7d5427acfe7579a1a':
  modified:   tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
2009-09-09 10:59:18 -07:00
Fred Quintana
be5bc78a98 am f43d282d: am b0dccf73: Merge change 24012 into eclair
Merge commit 'f43d282dc7ed88e6d018fa3729da568af8b58158'

* commit 'f43d282dc7ed88e6d018fa3729da568af8b58158':
  add a transaction monitor
2009-09-09 10:58:43 -07:00
Eric Fischer
7bbfdb2bf1 am 817f3cb4: (-s ours) am 046263ce: Merge change 24220 into eclair
Merge commit '817f3cb41bd5a412f50c131094cf52e04eab9141'

* commit '817f3cb41bd5a412f50c131094cf52e04eab9141':
  Import revised translations.  DO NOT MERGE
2009-09-09 10:56:38 -07:00
Yu Shan Emily Lau
7a9ed089a8 am 0f69788f: am 9bb1101f: Merge change 23924 into eclair
Merge commit '0f69788f62486f5759e16911effd4bbd9395bcce'

* commit '0f69788f62486f5759e16911effd4bbd9395bcce':
  new file:   LowStorageTest/Android.mk
2009-09-09 10:56:14 -07:00
Android (Google) Code Review
4e60d7e60b Merge change 24179 into eclair
* changes:
  Support encoding amr-wb content in stagefright.
2009-09-09 13:55:48 -04:00
Jaikumar Ganesh
b962208d8e 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
100f086133 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
0faff7b0cc 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
Andrei Popescu
cf7b5521fc Remove the call to nativeAddJavascriptInterface() from BrowserFrame::addJavascriptInterface() as it causes an intermitent crash. 2009-09-09 17:44:51 +01:00
Grace Kloba
b84214a329 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
ccda4c4960 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
894d083ec1 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
b9e52a07b7 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
Mathias Agopian
1d9161e262 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
44187ac07c 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
dfc6ca9652 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
11c803ac77 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
72e2d6da79 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
0a5bf25765 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
d42bd87f23 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
a280496bd2 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
53fb67a819 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
0c065d9ef1 Merge change 24117 into eclair
* changes:
  Replace the delimiter whitespace with '\0'.
2009-09-09 00:40:17 -07:00
Chung-yih Wang
801b73f661 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
d3a31996e6 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
db603b0b2c 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
e579dc1cc5 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
96c08a69ea 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
997eddb0a0 Merge change 24318 into eclair
* changes:
  Avoid CDMA messages with IDs of zero.
2009-09-08 22:55:49 -07:00
Tammo Spalink
98a5ba78f9 Avoid CDMA messages with IDs of zero.
In reference to issue:
http://buganizer/issue?id=2047571

Change-Id: I88b5cdbb988f12206663bbb3fdc9508a437b19ad
2009-09-09 13:50:07 +08:00