435 Commits

Author SHA1 Message Date
Charles Chen
0dbc6a44bb Fixing bug #2008185 - problem with the TTS dropping
utterances under heavy load was caused by the speech
queue being locked. Switched to using a timeout with
tryLock so that the TTS service does not give up
immediately.
2009-07-27 14:09:58 -07:00
Hung-ying Tyan
c0ecdf152d am 21bd4af8: Simplify the VPN service implementation.
Merge commit '21bd4af88a24d0df020f68683f7c60698ebcc76a'

* commit '21bd4af88a24d0df020f68683f7c60698ebcc76a':
  Simplify the VPN service implementation.
2009-07-26 21:47:40 -07:00
Hung-ying Tyan
21bd4af88a Simplify the VPN service implementation.
+ Remove NormalProcessProxy and ProcessProxy as they are not used
  anymore.
+ Rename AndroidServiceProxy to DaemonProxy and simplify its
  implementation as it does not extend to ProcessProxy anymore.
+ Execute connect() in VpnService in one thread, which simplifies socket
  and error handling.
+ Modify service subclasses accordingly.
+ Execute connect() and disconnect() in VpnServiceBinder so that the
  operations do not block the UI thread. Mark service as foreground only upon
  connecting.
2009-07-27 06:13:11 +08:00
Eric Laurent
a553c25b33 Fix issue 1795088 Improve audio routing code
Initial commit for review.
Integrated comments after patch set 1 review.
Fixed lockup in AudioFlinger::ThreadBase::exit()
Fixed lockup when playing tone with AudioPlocyService startTone()
2009-07-23 06:03:39 -07:00
Android (Google) Code Review
c098048892 am 7c94ceae: Merge change 8130 into donut
Merge commit '7c94ceaeac65f4604fa49df6dce9a8d584f52da2'

* commit '7c94ceaeac65f4604fa49df6dce9a8d584f52da2':
  Increase the volume of the AudioTrack instance used for the speech synthesis.
2009-07-21 18:18:43 -07:00
Jean-Michel Trivi
d702c357fc Increase the volume of the AudioTrack instance used for the speech synthesis. 2009-07-21 18:10:04 -07:00
Android (Google) Code Review
538ed77af4 am 841ed859: Merge change 8073 into donut
Merge commit '841ed8596a745d90822467bc2c0e13880bb59cc9'

* commit '841ed8596a745d90822467bc2c0e13880bb59cc9':
  Reset the speech synth singleton to null when the service is destroyed
2009-07-21 14:46:20 -07:00
Android (Google) Code Review
841ed8596a Merge change 8073 into donut
* changes:
  Reset the speech synth singleton to null when the service is destroyed so it can be recreated when the service is initialized. In the interface with the native synthesizer library, close the lib in the finalizer, delete the global ref to the SynthProxy java object.
2009-07-21 14:44:18 -07:00
Android (Google) Code Review
75c0928c59 am 8ece3445: Merge change 8061 into donut
Merge commit '8ece3445e8c95d02a47737ea2ac2d52a696143cd'

* commit '8ece3445e8c95d02a47737ea2ac2d52a696143cd':
  Throw a connecting exception when timed out.
2009-07-21 14:39:01 -07:00
Jean-Michel Trivi
cee3bd4d68 Reset the speech synth singleton to null when the service is destroyed
so it can be recreated when the service is initialized.
In the interface with the native synthesizer library, close the lib
in the finalizer, delete the global ref to the SynthProxy java object.
2009-07-21 14:22:25 -07:00
Android (Google) Code Review
8ece3445e8 Merge change 8061 into donut
* changes:
  Throw a connecting exception when timed out.
2009-07-21 14:16:55 -07:00
Hung-ying Tyan
bb22192421 Throw a connecting exception when timed out. 2009-07-22 04:37:39 +08:00
Android (Google) Code Review
305d9ba85d am 69a841a1: Merge change 8026 into donut
Merge commit '69a841a1649390d68b32b3bcf0c429a60c400cfa'

* commit '69a841a1649390d68b32b3bcf0c429a60c400cfa':
  Make sure the speech synthesizer proxy is a singleton in the TTS service.
2009-07-21 10:23:06 -07:00
Jean-Michel Trivi
a73d5cd055 Make sure the speech synthesizer proxy is a singleton in the TTS service. 2009-07-21 10:13:41 -07:00
Android (Google) Code Review
2f140bdb8a am 592f1a65: Merge change 7933 into donut
Merge commit '592f1a65815598f705260df9dbe5488e3990b45d'

* commit '592f1a65815598f705260df9dbe5488e3990b45d':
  Prevent the setLanguage() method in TextToSpeech to change the language
2009-07-20 16:21:46 -07:00
Jean-Michel Trivi
5e11a6ad00 Prevent the setLanguage() method in TextToSpeech to change the language
for all current TextToSpeech instances by only caching the language
value so it is used with each subsequent utterance for this instance.
Synchronize calls to the engine around a global mutex since the engine
isn't thread-safe, except for the stop() call which is meant to interrupt
the synthesis loop.
2009-07-20 16:07:57 -07:00
Android (Google) Code Review
115d23a86f am 5f6133a1: Merge change 7833 into donut
Merge commit '5f6133a100d4477dfcea919e81ff301f9352cd32'

* commit '5f6133a100d4477dfcea919e81ff301f9352cd32':
  Fixing the random audio mangling problem (TTS becomes incomprehensibly fast)
2009-07-20 09:53:48 -07:00
Android (Google) Code Review
5f6133a100 Merge change 7833 into donut
* changes:
  Fixing the random audio mangling problem (TTS becomes incomprehensibly fast)
2009-07-20 09:51:21 -07:00
Hung-ying Tyan
79b7c68d5a am 2c53de69: Stop a daemon before starting it
Merge commit '2c53de69045557a51290b50dfda2ddb6c7d01912'

* commit '2c53de69045557a51290b50dfda2ddb6c7d01912':
  Stop a daemon before starting it
2009-07-19 21:14:44 -07:00
Android (Google) Code Review
def06bcec0 am 4b897aa9: Merge change 7829 into donut
Merge commit '4b897aa99bf71f933f5b202c1531858382122d6f'

* commit '4b897aa99bf71f933f5b202c1531858382122d6f':
  Making sure that there are no calls made to the native TTS
2009-07-19 21:14:36 -07:00
Android (Google) Code Review
a1663400f9 am 39846e69: Merge change 7819 into donut
Merge commit '39846e691976fa7335bf5e648de46268d24b9927'

* commit '39846e691976fa7335bf5e648de46268d24b9927':
  Fix NullPointer in VpnServiceBinder.checkStatus().
2009-07-19 21:14:32 -07:00
Android (Google) Code Review
9707ad1257 am 931b0a7a: Merge change 7811 into donut
Merge commit '931b0a7ac83e33a29e32b691ae8818a2f41b7808'

* commit '931b0a7ac83e33a29e32b691ae8818a2f41b7808':
  Remove obsolete playBuffer() method from the text-to-speech SynthProxy class.
2009-07-19 20:29:03 -07:00
Hung-ying Tyan
2c53de6904 Stop a daemon before starting it
in case the daemon is not cleaned up in last session.
2009-07-19 09:33:56 +08:00
Charles Chen
342c329203 Fixing the random audio mangling problem (TTS becomes incomprehensibly fast) 2009-07-18 00:25:21 -07:00
Android (Google) Code Review
4b897aa99b Merge change 7829 into donut
* changes:
  Making sure that there are no calls made to the native TTS layer if the utterance is in the process of being canceled.
2009-07-17 21:39:26 -07:00
Charles Chen
b79370aad7 Making sure that there are no calls made to the native TTS
layer if the utterance is in the process of being canceled.
2009-07-17 20:57:21 -07:00
Android (Google) Code Review
39846e6919 Merge change 7819 into donut
* changes:
  Fix NullPointer in VpnServiceBinder.checkStatus().
2009-07-17 20:09:43 -07:00
Hung-ying Tyan
000c3ff943 Fix NullPointer in VpnServiceBinder.checkStatus(). 2009-07-18 10:20:10 +08:00
Jean-Michel Trivi
8b86da899a Remove obsolete playBuffer() method from the text-to-speech SynthProxy class. 2009-07-17 18:22:15 -07:00
Jean-Michel Trivi
86a9d55fcc am 19e53f7a: Delete global ref to the weak reference to the SynthProxy in the native_finalize function, that was created in native_setup to prevent leaking refs.
Merge commit '19e53f7ae506ccb294f46a36c70d7f3154b258ad'

* commit '19e53f7ae506ccb294f46a36c70d7f3154b258ad':
  Delete global ref to the weak reference to the SynthProxy in the
2009-07-17 13:58:30 -07:00
Android (Google) Code Review
07bca34551 am 9db0d36c: Merge change 7600 into donut
Merge commit '9db0d36c6141d8e0ccf6ca6c450872f03b55c15f'

* commit '9db0d36c6141d8e0ccf6ca6c450872f03b55c15f':
  Update youtube bookmark
2009-07-17 02:08:53 -07:00
Jean-Michel Trivi
19e53f7ae5 Delete global ref to the weak reference to the SynthProxy in the
native_finalize function, that was created in native_setup to prevent
leaking refs.
2009-07-16 20:13:12 -07:00
Android (Google) Code Review
db9acb74ab am 65d99c3c: Merge change 7537 into donut
Merge commit '65d99c3cbf149776c7ec4ea1f3cb1f4470d2be83'

* commit '65d99c3cbf149776c7ec4ea1f3cb1f4470d2be83':
  Fixing a race condition that causes synthesis to not be aborted
2009-07-16 17:54:13 -07:00
Jim Miller
82887f079f Update youtube bookmark 2009-07-16 15:33:10 -07:00
Charles Chen
c231fd0fe7 Fixing a race condition that causes synthesis to not be aborted
even if stop is called.
2009-07-16 11:29:34 -07:00
Android (Google) Code Review
31ee5e0de7 am 83fa3565: Merge change 7356 into donut
Merge commit '83fa3565896ed19846f6498c00de3cc9a29b1a57'

* commit '83fa3565896ed19846f6498c00de3cc9a29b1a57':
  Fixing a bug in how stop works - keep stop from always stopping
2009-07-15 13:41:54 -07:00
Android (Google) Code Review
cc320c81a4 am b197021e: Merge change 7335 into donut
Merge commit 'b197021e160091897391cd27093c35bd3c22a7fc'

* commit 'b197021e160091897391cd27093c35bd3c22a7fc':
  Making sure that the audio buffers for speech are cleared
2009-07-15 13:41:25 -07:00
Android (Google) Code Review
83fa356589 Merge change 7356 into donut
* changes:
  Fixing a bug in how stop works - keep stop from always stopping the currently speaking item if that item does not belong to the app that is trying to do the stop.
2009-07-15 09:28:45 -07:00
Charles Chen
6f624239dc Fixing a bug in how stop works - keep stop from always stopping
the currently speaking item if that item does not belong to the
app that is trying to do the stop.

Also adds back the functionality of globally stopping speech that
was lost when utterance IDs were added (needed by screen reader).
2009-07-14 19:30:29 -07:00
Charles Chen
4a3368ffe8 Making sure that the audio buffers for speech are cleared
so that there are no leftovers which could cause mangled output.
2009-07-14 18:21:27 -07:00
Android (Google) Code Review
8f779f3b70 am 3660c095: Merge change 7094 into donut
Merge commit '3660c09500a4d01eb6a733b5f0b15545855f8fe8'

* commit '3660c09500a4d01eb6a733b5f0b15545855f8fe8':
  Cleaning up TtsService
2009-07-14 10:57:46 -07:00
Charles Chen
edb4fc3076 Cleaning up TtsService 2009-07-14 10:54:36 -07:00
Android (Google) Code Review
381495d31a am df01d6b5: Merge change 7064 into donut
Merge commit 'df01d6b50b4502f12947bf4c6cc733a4a467f682'

* commit 'df01d6b50b4502f12947bf4c6cc733a4a467f682':
  Implementing utterance ID callbacks for silence and pre-recorded files
2009-07-14 10:50:32 -07:00
Android (Google) Code Review
6b316a7ff0 am 3a27b29e: Merge change 7069 into donut
Merge commit '3a27b29e41777e58fbcdca440a00676915ebea4f'

* commit '3a27b29e41777e58fbcdca440a00676915ebea4f':
  Make VPN connect even when DNS is not present and other fixes.
2009-07-14 10:21:37 -07:00
Android (Google) Code Review
a9ce57b55a am 8af55ca4: Merge change 7008 into donut
Merge commit '8af55ca4dd7eeb098b5c2e69bc7a9171c893269a'

* commit '8af55ca4dd7eeb098b5c2e69bc7a9171c893269a':
  Adding Utterance ID to the TtsService.
2009-07-14 10:21:16 -07:00
Android (Google) Code Review
df01d6b50b Merge change 7064 into donut
* changes:
  Implementing utterance ID callbacks for silence and pre-recorded files (both generating and playing).
2009-07-14 09:18:46 -07:00
Android (Google) Code Review
3a27b29e41 Merge change 7069 into donut
* changes:
  Make VPN connect even when DNS is not present and other fixes.
2009-07-14 01:53:56 -07:00
Hung-ying Tyan
85646c1df3 Make VPN connect even when DNS is not present and other fixes.
* Changes:
  + As title.
  + Add two new states to VpnState: UNKNOWN and UNUSABLE.
  + Add more debug messages when stopping a service and when DNS being
    overridden.
2009-07-14 16:29:22 +08:00
Charles Chen
3ab2076d65 Implementing utterance ID callbacks for silence and pre-recorded files
(both generating and playing).
2009-07-13 21:21:01 -07:00
Android (Google) Code Review
8af55ca4dd Merge change 7008 into donut
* changes:
  Adding Utterance ID to the TtsService.
2009-07-13 18:25:01 -07:00