368 Commits

Author SHA1 Message Date
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
Charles Chen
78c9d0d2c5 Adding Utterance ID to the TtsService. 2009-07-13 17:46:19 -07:00
Android (Google) Code Review
1dcdce6db7 am c353268c: Merge change 6968 into donut
Merge commit 'c353268c20a8ea425ac9f1e328684855cfc805e0'

* commit 'c353268c20a8ea425ac9f1e328684855cfc805e0':
  Import new translations
2009-07-13 16:32:17 -07:00
Android (Google) Code Review
c353268c20 Merge change 6968 into donut
* changes:
  Import new translations
2009-07-13 16:30:16 -07:00
Eric Fischer
0560209bcd Import new translations 2009-07-13 15:42:14 -07:00
Android (Google) Code Review
3cdff8133b am 334b861e: Merge change 6925 into donut
Merge commit '334b861e3339bc7189372f790d0c0e2043d160a3'

* commit '334b861e3339bc7189372f790d0c0e2043d160a3':
  Propagate optional audio stream type to the creation of the audio resources
2009-07-13 13:37:56 -07:00
Jean-Michel Trivi
9440bce855 Propagate optional audio stream type to the creation of the audio resources
to enable the playback of TTS content on various stream types.
2009-07-13 11:34:30 -07:00
Android (Google) Code Review
c8050f8dd7 am 6cdc4f9c: Merge change 6880 into donut
Merge commit '6cdc4f9c00eafcecec74dbd7f74202508830fdd3'

* commit '6cdc4f9c00eafcecec74dbd7f74202508830fdd3':
  Fixing TTS breakage.
2009-07-13 09:27:44 -07:00
Android (Google) Code Review
6cdc4f9c00 Merge change 6880 into donut
* changes:
  Fixing TTS breakage.
2009-07-13 09:25:20 -07:00
Hung-ying Tyan
99b490969b am c22ce6a7: Remove host IP from related VPN classes.
Merge commit 'c22ce6a738bbd757c71f8778defb015ea81ab33c'

* commit 'c22ce6a738bbd757c71f8778defb015ea81ab33c':
  Remove host IP from related VPN classes.
2009-07-13 04:35:29 -07:00
Hung-ying Tyan
c22ce6a738 Remove host IP from related VPN classes.
...since the daemon (racoon) gets the information by itself.
2009-07-13 19:31:08 +08:00
Android (Google) Code Review
4005648ec7 am 575eb928: Merge change 6883 into donut
Merge commit '575eb92885c150ccbfa257c9a6fdcb19a04baf0c'

* commit '575eb92885c150ccbfa257c9a6fdcb19a04baf0c':
  Add error code in vpn connectivity broadcast.
2009-07-12 23:43:21 -07:00
Hung-ying Tyan
df1aa3359c Add error code in vpn connectivity broadcast.
* Changes
  + Add VpnConnectingError.java.
  + Broadcast the error returned by daemons.
  + Add error codes to VpnManager.java.
  + Add error code to VpnManager.broadcastConnectivity().
  Patch Set 4:
  + Replace VPN_UP with VPN_STATUS in response to ip-up-vpn changes.
  + Make VpnServiceBinder a foreground service so that it won't be
    interrupted by the system.
  Patch Set 5:
  + Remove the support of returning 0 from daemon and restart socket in
    AndroidServiceProxy.
2009-07-13 13:11:36 +08:00
Charles Chen
630a8de44f Fixing TTS breakage. 2009-07-10 20:58:15 -07:00
Jean-Michel Trivi
89fe27366b am d48ca22b: Use the TTS queue constants in the TTS service as defined in the TextToSpeech class.
Merge commit 'd48ca22b9fcea38b112aedb4126f3d030594af47'

* commit 'd48ca22b9fcea38b112aedb4126f3d030594af47':
  Use the TTS queue constants in the TTS service as defined in the
2009-07-10 11:20:27 -07:00
Jean-Michel Trivi
d48ca22b9f Use the TTS queue constants in the TTS service as defined in the
TextToSpeech class.
2009-07-10 10:04:37 -07:00
Android (Google) Code Review
bdafc9b65f am d2cad295: Merge change 6734 into donut
Merge commit 'd2cad2951fe97bd75e27fae522cf683bae8b9b71'

* commit 'd2cad2951fe97bd75e27fae522cf683bae8b9b71':
  Adding tagging to utterances to track which app said what.
2009-07-10 09:57:38 -07:00
Charles Chen
a9c5e4bf26 Adding tagging to utterances to track which app said what. 2009-07-10 09:43:03 -07:00