247 Commits

Author SHA1 Message Date
Android (Google) Code Review
455266e173 am b203a57d: Merge change 9114 into donut
Merge commit 'b203a57d1f00fe509e0d065cd928099bb7d19d87'

* commit 'b203a57d1f00fe509e0d065cd928099bb7d19d87':
  Add state saving mechanism to support proc restart
2009-07-30 16:05:45 -07:00
Android (Google) Code Review
ba272be725 Merge change 9097
* changes:
  Wifi: Add support for enabling Wifi while in airplane mode.
2009-07-30 08:35:03 -07:00
Android (Google) Code Review
cdc0d941e8 am 2bad713f: Merge change 8860 into donut
Merge commit '2bad713f31d642d5350949b90b3abe00fbd9ca55'

* commit '2bad713f31d642d5350949b90b3abe00fbd9ca55':
  Fix bug 2017664
2009-07-30 06:56:37 -07:00
Hung-ying Tyan
fe8e48cdd5 Add state saving mechanism to support proc restart
Also...
+ stop daemons before getting server IP;
+ remove setForeground();
+ add the DBG flag for Log.d calls.

PatchSet 3:
+ add CHALLENGE_ERROR and REMOTE_HUNG_UP to VpnManager
+ broadcast new error codes in VpnService
+ check local IP change instead of dns change
+ move removeStates() to VpnService.onFinalCleanUp()

PatchSet 7:
+ add encryption flag to PptpProfile
+ PptpService and MtpdHelper are revised accordingly
2009-07-30 19:14:50 +08:00
Mike Lockwood
bd5ddf01e4 Wifi: Add support for enabling Wifi while in airplane mode.
If the new system settings value for AIRPLANE_MODE_TOGGLEABLE_RADIOS
contains RADIO_WIFI, then the user will be allowed to enable Wifi
while in airplane mode.
Turning on airplane mode will still disable Wifi, but the user will
be free to reenable it in the Settings app.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-07-29 21:37:14 -07:00
Jean-Michel Trivi
ed06578edd Fix bug 2017664
Removed the TTS_ prefix in the TextToSpeech class to follow the standard naming convention.
Moved the TTS-related intents from the Intent class to TextToSpeech and TextToSpeech.Engine.
Renamed the TextToSpeech.Engine constants that are used as extras for the
  ACTION_TTS_CHECK_TTS_DATA intent to prefix them with EXTRA_.
Cleaned up the other TextToSpeech.Engine constant to remove superfluous mentions of
  "TTS" in the name.
2009-07-29 11:26:10 -07:00
Android (Google) Code Review
e406906e16 Merge change 8878
* changes:
  Support for selection of silent ringtone from the ringtone picker. This doesn't actually enable that, but adds the necessary code to make it work when enabled, and cleans up some ringtone related code.
2009-07-28 16:26:40 -07:00
Marco Nelissen
69f593ccb7 Support for selection of silent ringtone from the ringtone picker.
This doesn't actually enable that, but adds the necessary code to make it work when enabled, and cleans up some ringtone related code.
2009-07-28 16:06:38 -07:00
Eric Fischer
f7573bd2b7 resolved conflicts for merge of cdb9e971 to master 2009-07-28 11:27:07 -07:00
Android (Google) Code Review
cdb9e971d9 Merge change 8806 into donut
* changes:
  Mark the the airplane mode internal strings as not translatable.
2009-07-28 10:27:56 -07:00
Eric Fischer
2bfe11af6f Mark the the airplane mode internal strings as not translatable.
Bug 2017552
2009-07-28 10:17:25 -07:00
Android (Google) Code Review
0326beef19 am 79858fe2: Merge change 8678 into donut
Merge commit '79858fe2f5b088ad93e461ea94e544bfce3c2e09'

* commit '79858fe2f5b088ad93e461ea94e544bfce3c2e09':
  Fixing bug #2008185 - problem with the TTS dropping
2009-07-27 15:09:59 -07:00
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