summaryrefslogtreecommitdiffstats
path: root/packages
Commit message (Collapse)AuthorAgeFilesLines
...
| | * Fix bug 2043140.Jean-Michel Trivi2009-08-111-18/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A race condition is encountered when an application invokes shutdown() on its TextToSpeech object while is has speak() requests still running. Since the TTS service destructor releases the synthesizer resources and sets the corresponding synth reference to null, an NPE was observed. The fix consists in catching NPEs whenever the sNativeSynth object is accessed, and return the matching error for the call. This change is a "low risk" version of the fix for bug 2025765i (same issue) which was reverted because it was higher risk than this CL: it affected the logic of each call to sNativeSynth. This CL only sets an error code when an NPE is fired because sNativeSynth is null.
* | | am 7b98b666: Merge change 20738 into donutHung-ying Tyan2009-08-111-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '7b98b666ec465259c676c90cb12f3d1b4e1c7cf7' * commit '7b98b666ec465259c676c90cb12f3d1b4e1c7cf7': Fix a bug in getSocketError() in VpnService.
| * | Fix a bug in getSocketError() in VpnService.Hung-ying Tyan2009-08-121-1/+1
| | |
* | | am c22e0c80: Merge change 20719 into donutHung-ying Tyan2009-08-111-45/+42
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'c22e0c8012828474e8aa2e29b441ef02728b0842' * commit 'c22e0c8012828474e8aa2e29b441ef02728b0842': Fix order of setting/saving state in VpnService.
| * | Fix order of setting/saving state in VpnService.Hung-ying Tyan2009-08-111-45/+42
| |/ | | | | | | | | and also refactor code making sure a thread won't grab two locks (which may cause deadlocks in some corner cases).
* | Change WIFI keyChristian Sonntag2009-08-071-2/+7
| |
* | Retain state of wifi connection after restoreChristian Sonntag2009-08-071-3/+10
| |
* | Fix error in settings.db upgrader. See bug 1999477 for details.Jim Miller2009-08-041-1/+1
| |
* | am fbe89ec6: Revert "Fix bug 2025765."Jean-Michel Trivi2009-08-041-42/+4
|\ \ | |/ | | | | | | | | | | Merge commit 'fbe89ec6404978da7899b944d989dd9f50a468b5' * commit 'fbe89ec6404978da7899b944d989dd9f50a468b5': Revert "Fix bug 2025765."
| * Revert "Fix bug 2025765."Jean-Michel Trivi2009-08-041-42/+4
| | | | | | | | This reverts commit 9ebb59b8aa75cab1e5bb53983893b579abb63edd.
| * Import revised translations. DO NOT MERGEEric Fischer2009-08-0319-64/+100
| |
* | am 377b21e9: Merge change 9502 into donutAndroid (Google) Code Review2009-08-031-4/+42
|\ \ | |/ | | | | | | | | | | Merge commit '377b21e9f531e3fec1a5849453f886b5462e4144' * commit '377b21e9f531e3fec1a5849453f886b5462e4144': Fix bug 2025765.
| * Merge change 9502 into donutAndroid (Google) Code Review2009-08-031-4/+42
| |\ | | | | | | | | | | | | * changes: Fix bug 2025765. Talkback produced a null pointer exception when being enabled and disabled repeatedly due to a race condition between the onDestroy() of the service, and the use of the service itself. The error occurs when one Talkback thread initiates the destruction of the service (call to onDestroy()) when it invokes shutdown() on its TextToSpeech instance (the client of the service). At the same time, Talkback tries to say that "Accessibility" is unchecked from another thread. During onDestroy(), the reference to the TTS engine (sNativeSynth) is reset to null, which is used in the service in speakInternalOnly(), and setLanguage(). The fix consists in the addition of a static variable that signals that the service has entered onDestroy(). Once this flag is set, all method invocations on sNativeSynth will be dismissed. Note that access to the native resources used by sNativeSynth are synchronized at the native layer, therefore preventing sNativeSynth.shutdown() to interfere with a sNativeSynth.speak() call already underway.
| | * Fix bug 2025765.Jean-Michel Trivi2009-08-031-4/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Talkback produced a null pointer exception when being enabled and disabled repeatedly due to a race condition between the onDestroy() of the service, and the use of the service itself. The error occurs when one Talkback thread initiates the destruction of the service (call to onDestroy()) when it invokes shutdown() on its TextToSpeech instance (the client of the service). At the same time, Talkback tries to say that "Accessibility" is unchecked from another thread. During onDestroy(), the reference to the TTS engine (sNativeSynth) is reset to null, which is used in the service in speakInternalOnly(), and setLanguage(). The fix consists in the addition of a static variable that signals that the service has entered onDestroy(). Once this flag is set, all method invocations on sNativeSynth will be dismissed. Note that access to the native resources used by sNativeSynth are synchronized at the native layer, therefore preventing sNativeSynth.shutdown() to interfere with a sNativeSynth.speak() call already underway.
* | | am 93540670: Issue an error when VPN connection is lost.Hung-ying Tyan2009-08-031-9/+21
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '935406709edb9aaf6538e23e88ecfdf77cccd8ba' * commit '935406709edb9aaf6538e23e88ecfdf77cccd8ba': Issue an error when VPN connection is lost.
| * | Issue an error when VPN connection is lost.Hung-ying Tyan2009-08-031-9/+21
| | | | | | | | | | | | | | | | | | | | | + Add new error code CONNECTION_LOST to VpnManager. + Make VpnService call onError() instead of onDisconnect() when connection is lost. + Make VpnService broadcast CONNECTION_LOST when that happens.
* | | am dc1d5704: Fix the auto notification cleanup when vpn is disconnected.Chung-yih Wang2009-08-031-7/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'dc1d5704a725d207b98de1b117847297958d9148' * commit 'dc1d5704a725d207b98de1b117847297958d9148': Fix the auto notification cleanup when vpn is disconnected.
| * | Fix the auto notification cleanup when vpn is disconnected.Chung-yih Wang2009-08-031-7/+0
| |/ | | | | | | + add the log print if the browser give the incorrect data in addCertificate().
* | am b203a57d: Merge change 9114 into donutAndroid (Google) Code Review2009-07-308-102/+253
|\ \ | |/ | | | | | | | | | | Merge commit 'b203a57d1f00fe509e0d065cd928099bb7d19d87' * commit 'b203a57d1f00fe509e0d065cd928099bb7d19d87': Add state saving mechanism to support proc restart
| * Add state saving mechanism to support proc restartHung-ying Tyan2009-07-308-102/+253
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge change 9097Android (Google) Code Review2009-07-302-1/+20
|\ \ | | | | | | | | | | | | * changes: Wifi: Add support for enabling Wifi while in airplane mode.
| * | Wifi: Add support for enabling Wifi while in airplane mode.Mike Lockwood2009-07-292-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | am 2bad713f: Merge change 8860 into donutAndroid (Google) Code Review2009-07-301-31/+31
|\ \ \ | |/ / |/| / | |/ | | | | | | Merge commit '2bad713f31d642d5350949b90b3abe00fbd9ca55' * commit '2bad713f31d642d5350949b90b3abe00fbd9ca55': Fix bug 2017664
| * Fix bug 2017664Jean-Michel Trivi2009-07-291-31/+31
| | | | | | | | | | | | | | | | | | 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.
* | Merge change 8878Android (Google) Code Review2009-07-281-5/+63
|\ \ | | | | | | | | | | | | * 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.
| * | Support for selection of silent ringtone from the ringtone picker.Marco Nelissen2009-07-281-5/+63
| | | | | | | | | | | | This doesn't actually enable that, but adds the necessary code to make it work when enabled, and cleans up some ringtone related code.
* | | resolved conflicts for merge of cdb9e971 to masterEric Fischer2009-07-2817-187/+11
|\ \ \ | |/ / |/| / | |/
| * Merge change 8806 into donutAndroid (Google) Code Review2009-07-2817-187/+11
| |\ | | | | | | | | | | | | * changes: Mark the the airplane mode internal strings as not translatable.
| | * Mark the the airplane mode internal strings as not translatable.Eric Fischer2009-07-2817-187/+11
| | | | | | | | | | | | Bug 2017552
* | | am 79858fe2: Merge change 8678 into donutAndroid (Google) Code Review2009-07-271-8/+13
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '79858fe2f5b088ad93e461ea94e544bfce3c2e09' * commit '79858fe2f5b088ad93e461ea94e544bfce3c2e09': Fixing bug #2008185 - problem with the TTS dropping
| * | Fixing bug #2008185 - problem with the TTS droppingCharles Chen2009-07-271-8/+13
| |/ | | | | | | | | | | | | 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.
* | am 21bd4af8: Simplify the VPN service implementation.Hung-ying Tyan2009-07-269-740/+370
|\ \ | |/ | | | | | | | | | | Merge commit '21bd4af88a24d0df020f68683f7c60698ebcc76a' * commit '21bd4af88a24d0df020f68683f7c60698ebcc76a': Simplify the VPN service implementation.
| * Simplify the VPN service implementation.Hung-ying Tyan2009-07-279-740/+370
| | | | | | | | | | | | | | | | | | | | | | | | | | + 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.
* | Fix issue 1795088 Improve audio routing codeEric Laurent2009-07-232-8/+28
| | | | | | | | | | | | | | 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()
* | am 7c94ceae: Merge change 8130 into donutAndroid (Google) Code Review2009-07-211-0/+1
|\ \ | |/ | | | | | | | | | | Merge commit '7c94ceaeac65f4604fa49df6dce9a8d584f52da2' * commit '7c94ceaeac65f4604fa49df6dce9a8d584f52da2': Increase the volume of the AudioTrack instance used for the speech synthesis.
| * Increase the volume of the AudioTrack instance used for the speech synthesis.Jean-Michel Trivi2009-07-211-0/+1
| |
* | am 841ed859: Merge change 8073 into donutAndroid (Google) Code Review2009-07-212-28/+37
|\ \ | |/ | | | | | | | | | | Merge commit '841ed8596a745d90822467bc2c0e13880bb59cc9' * commit '841ed8596a745d90822467bc2c0e13880bb59cc9': Reset the speech synth singleton to null when the service is destroyed
| * Merge change 8073 into donutAndroid (Google) Code Review2009-07-212-28/+37
| |\ | | | | | | | | | | | | * 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.
| | * Reset the speech synth singleton to null when the service is destroyedJean-Michel Trivi2009-07-212-28/+37
| | | | | | | | | | | | | | | | | | 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.
* | | am 8ece3445: Merge change 8061 into donutAndroid (Google) Code Review2009-07-211-0/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '8ece3445e8c95d02a47737ea2ac2d52a696143cd' * commit '8ece3445e8c95d02a47737ea2ac2d52a696143cd': Throw a connecting exception when timed out.
| * | Merge change 8061 into donutAndroid (Google) Code Review2009-07-211-0/+3
| |\ \ | | |/ | |/| | | | | | | * changes: Throw a connecting exception when timed out.
| | * Throw a connecting exception when timed out.Hung-ying Tyan2009-07-221-0/+3
| | |
* | | am 69a841a1: Merge change 8026 into donutAndroid (Google) Code Review2009-07-211-29/+31
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '69a841a1649390d68b32b3bcf0c429a60c400cfa' * commit '69a841a1649390d68b32b3bcf0c429a60c400cfa': Make sure the speech synthesizer proxy is a singleton in the TTS service.
| * | Make sure the speech synthesizer proxy is a singleton in the TTS service.Jean-Michel Trivi2009-07-211-29/+31
| |/
* | am 592f1a65: Merge change 7933 into donutAndroid (Google) Code Review2009-07-202-6/+20
|\ \ | |/ | | | | | | | | | | Merge commit '592f1a65815598f705260df9dbe5488e3990b45d' * commit '592f1a65815598f705260df9dbe5488e3990b45d': Prevent the setLanguage() method in TextToSpeech to change the language
| * Prevent the setLanguage() method in TextToSpeech to change the languageJean-Michel Trivi2009-07-202-6/+20
| | | | | | | | | | | | | | | | 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.
* | am 5f6133a1: Merge change 7833 into donutAndroid (Google) Code Review2009-07-201-1/+1
|\ \ | |/ | | | | | | | | | | Merge commit '5f6133a100d4477dfcea919e81ff301f9352cd32' * commit '5f6133a100d4477dfcea919e81ff301f9352cd32': Fixing the random audio mangling problem (TTS becomes incomprehensibly fast)
| * Merge change 7833 into donutAndroid (Google) Code Review2009-07-201-1/+1
| |\ | | | | | | | | | | | | * changes: Fixing the random audio mangling problem (TTS becomes incomprehensibly fast)
| | * Fixing the random audio mangling problem (TTS becomes incomprehensibly fast)Charles Chen2009-07-181-1/+1
| | |
* | | am 2c53de69: Stop a daemon before starting itHung-ying Tyan2009-07-192-0/+8
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '2c53de69045557a51290b50dfda2ddb6c7d01912' * commit '2c53de69045557a51290b50dfda2ddb6c7d01912': Stop a daemon before starting it