drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,023 Commits 1 Branch 0 Tags
Commit Graph

316 Commits

Author SHA1 Message Date
Android (Google) Code Review
8b7bc669ce am b45451f6: Merge change 6583 into donut 
Merge commit 'b45451f6dac5b32bcd8c52352a9697854eab40d0'

* commit 'b45451f6dac5b32bcd8c52352a9697854eab40d0':
  Adding a lock to stop so that stop will stop utterances
 2009-07-09 12:50:30 -07:00
Android (Google) Code Review
ad921cb4a4 am c52d55c5: Merge change 6608 into donut 
Merge commit 'c52d55c5404a09a3845a322f50577fc4c125a86d'

* commit 'c52d55c5404a09a3845a322f50577fc4c125a86d':
  Move the watchdog timer to a separate thread...
 2009-07-09 12:49:29 -07:00
Android (Google) Code Review
d1e5e3ffc2 Merge change 6639 into donut 
* changes:
  Restore audio settings and wifi.
 2009-07-09 12:07:45 -07:00
Amith Yamasani
d158214511 Restore audio settings and wifi. 
Optimize backups by writing an entity only if the checksum of the data has changed.
Call into the hidden AudioService API to apply changed audio settings.
After restoring wifi data, make sure that the permissions and ownership are set
properly for the supplicant process to access it.
Locale isn't restoring properly - TODO added.
 2009-07-09 12:01:25 -07:00
Charles Chen
be84e4134d Unbreaking the build. 2009-07-09 11:54:50 -07:00
Android (Google) Code Review
b45451f6da Merge change 6583 into donut 
* changes:
  Adding a lock to stop so that stop will stop utterances that are just starting up.
 2009-07-09 11:05:18 -07:00
Charles Chen
0a3d8744fe Adding a lock to stop so that stop will stop utterances 
that are just starting up.
 2009-07-09 09:51:33 -07:00
Hung-ying Tyan
296a182dea Move the watchdog timer to a separate thread... 
so that it won't block the UI thread.
 2009-07-09 14:43:55 +08:00
-b master
2eac99ccbc resolved conflicts for merge of d6fe243c to master 2009-07-07 22:55:28 -07:00
Android (Google) Code Review
d6fe243c1c Merge change 6437 into donut 
* changes:
  Backup / Restore locale preference.
 2009-07-07 18:59:28 -07:00
Amith Yamasani
8823c0a8c6 Backup / Restore locale preference. 
Also backup development settings MOCK_LOCATION and USB_DEBUGGING.
Backup and restore more of the Audio settings. Won't work yet without a reboot.
Disable Wifi supplicant restore temporarily. It seems to be disabling Wifi due to
permissions problems.
Don't restore Ringtones.
 2009-07-07 18:42:46 -07:00
Android (Google) Code Review
b4f7ce46e8 am e9289dc6: Merge change 6422 into donut 
Merge commit 'e9289dc63e1f57e26355537709df1538ecfd08b1'

* commit 'e9289dc63e1f57e26355537709df1538ecfd08b1':
  Removing the ttsSynthDoneCallback logging.
 2009-07-07 16:45:36 -07:00
Charles Chen
2a8a2d76f1 Removing the ttsSynthDoneCallback logging. 2009-07-07 16:24:02 -07:00
Android (Google) Code Review
e68d572630 am 86ea435a: Merge change 6407 into donut 
Merge commit '86ea435a40c5ffa9a03dc0ac9536378a33c9e5b4'

* commit '86ea435a40c5ffa9a03dc0ac9536378a33c9e5b4':
  Cleaning up logs.
 2009-07-07 15:39:03 -07:00
Charles Chen
b02ced7e45 Cleaning up logs. 
Initializing SpeechItem.mText to "" instead of null to
prevent a null from accidentally being used when it is a
non-text utterance.
 2009-07-07 14:57:16 -07:00
Android (Google) Code Review
0f653aeeca am b61479ae: Merge change 6314 into donut 
Merge commit 'b61479ae868c9f2b887b2992b133a96d9ea1a193'

* commit 'b61479ae868c9f2b887b2992b133a96d9ea1a193':
  Use the current Locale as the default language when TTS settings are not
 2009-07-07 10:37:17 -07:00
Android (Google) Code Review
b61479ae86 Merge change 6314 into donut 
* changes:
  Use the current Locale as the default language when TTS settings are not found, rather than a hardcoded value stored in TextToSpeech.Engine.
 2009-07-07 10:35:40 -07:00
Jean-Michel Trivi
d478cf09df Use the current Locale as the default language when TTS settings are not 
found, rather than a hardcoded value stored in TextToSpeech.Engine.
 2009-07-06 18:02:08 -07:00
-b master
f6a34dd6ab resolved conflicts for merge of b7195159 to master 2009-07-06 17:44:41 -07:00
Android (Google) Code Review
b71951591d Merge change 6287 into donut 
* changes:
  Restore GPS state and ringer/vibrate toggles.
 2009-07-06 17:32:09 -07:00
Amith Yamasani
70c874ba20 Restore GPS state and ringer/vibrate toggles. 
Inform backup manager when sync flags change. Set ringer/vibrate mode.
 2009-07-06 17:18:46 -07:00
Android (Google) Code Review
4fad469b65 am 453dd50e: Merge change 6307 into donut 
Merge commit '453dd50e707aa3a4d24240935f3ff7ea0a08dc7a'

* commit '453dd50e707aa3a4d24240935f3ff7ea0a08dc7a':
  Fixes a compatibility issue with users that have the old TTS
 2009-07-06 16:29:05 -07:00
Charles Chen
52ae06521a Fixes a compatibility issue with users that have the old TTS 
installed already.
 2009-07-06 16:10:32 -07:00
Android (Google) Code Review
d719890cab Merge change 6285 
* changes:
  Make backup agent run in the system process as well.
 2009-07-06 14:48:43 -07:00
Amith Yamasani
344bf682c9 Make backup agent run in the system process as well. 2009-07-06 14:47:30 -07:00
Android (Google) Code Review
2960975f39 am da93c26a: Merge change 6271 into donut 
Merge commit 'da93c26a3d2ee0b7d51561b786bde63b7b238c50'

* commit 'da93c26a3d2ee0b7d51561b786bde63b7b238c50':
  Propagating the error codes through the TtsService
 2009-07-06 14:45:20 -07:00
Amith Yamasani
47873e5526 Backup Wifi supplicant data. 
WifiService requests a backup when it writes wifi configuration to disk.
Backup the wifi supplicant file when settings provider runs backup.
 2009-07-06 14:28:06 -07:00
Charles Chen
a3f89295ad Propagating the error codes through the TtsService 2009-07-06 14:14:52 -07:00
-b master
501eec92f9 Revert "hand rolled out 220f4d633be1098e7887dbd06f179138bf19f1ad due to interface changes on master, the change will need to be made again" 
This reverts commit f8e3ba5bfad14f3037d72eb6243258c13169cbd8.
 2009-07-06 14:05:11 -07:00
Android (Google) Code Review
01737b9c94 am 87e393f1: Merge change 6227 into donut 
Merge commit '87e393f1c81f190fa62d23059fc1109398a6e58b'

* commit '87e393f1c81f190fa62d23059fc1109398a6e58b':
  Adding tts result codes.
 2009-07-06 12:00:17 -07:00
Hung-ying Tyan
395c092473 am 46841db4: Add PPTP and L2TP/IPSec PSK service dispatching 
Merge commit '46841db4f2c7360d3b861a816e51f76acca0d677'

* commit '46841db4f2c7360d3b861a816e51f76acca0d677':
  Add PPTP and L2TP/IPSec PSK service dispatching
 2009-07-06 11:22:45 -07:00
Android (Google) Code Review
90a7edac29 am 1f2bb46b: Merge change 6204 into donut 
Merge commit '1f2bb46b9a2762a6f57ca8801d91e9dee002158f'

* commit '1f2bb46b9a2762a6f57ca8801d91e9dee002158f':
  Migrate to new keystore with the CertTool lib.
 2009-07-06 11:22:36 -07:00
Android (Google) Code Review
8d85cf0cfa am 6b1ab257: Merge change 6187 into donut 
Merge commit '6b1ab2572ed114beba07230f6fa9c02519cf27df'

* commit '6b1ab2572ed114beba07230f6fa9c02519cf27df':
  Fix strings.
 2009-07-06 11:22:07 -07:00
Charles Chen
f7c815b5a9 am 4bca97ec: Removing IPA - IPA is already handled by the phoneme tag. 
Merge commit '4bca97ecaf04c50d5ed49920d119f9ffa6c29402'

* commit '4bca97ecaf04c50d5ed49920d119f9ffa6c29402':
  Removing IPA - IPA is already handled by the phoneme tag.
 2009-07-06 11:17:45 -07:00
Charles Chen
35b86c273a Adding tts result codes. 2009-07-06 10:51:48 -07:00
Hung-ying Tyan
46841db4f2 Add PPTP and L2TP/IPSec PSK service dispatching 2009-07-06 23:38:48 +08:00
Hung-ying Tyan
7d22e15e1b Migrate to new keystore with the CertTool lib. 2009-07-06 17:12:53 +08:00
The Android Open Source Project
f8e3ba5bfa hand rolled out 220f4d633be1098e7887dbd06f179138bf19f1ad due to interface changes on master, the change will need to be made again 2009-07-03 10:51:26 -07:00
Android (Google) Code Review
6b1ab2572e Merge change 6187 into donut 
* changes:
  Fix strings.
 2009-07-03 09:44:29 -07:00
Hung-ying Tyan
0102dc6b22 Fix strings. 
* Changes
  + Remove "Up time:" from ongoing event display.
  + Add hint in disconnected notification.
 2009-07-04 00:24:48 +08:00
Android (Google) Code Review
133ec72f24 am 288fe16c: Merge change 6043 into donut 
Merge commit '288fe16c20e2c20556839046d38c487b0b18735c'

* commit '288fe16c20e2c20556839046d38c487b0b18735c':
  System and Secure settings backup.
 2009-07-03 08:58:49 -07:00
The Android Open Source Project
575d1af980 resolved conflicts for merge of cf098294 to master 2009-07-03 08:55:59 -07:00
Android (Google) Code Review
2f97e984b5 Merge change 6130 into donut 
* changes:
  Make backup agent run in the system process as well.
 2009-07-03 00:00:19 -07:00
Charles Chen
4bca97ecaf Removing IPA - IPA is already handled by the phoneme tag. 2009-07-02 17:21:22 -07:00
Android (Google) Code Review
385276028d am 74dc3e4a: Merge change 5616 into donut 
Merge commit '74dc3e4a1e4f9c4eed3a3619ffc8beff30b3ec0f'

* commit '74dc3e4a1e4f9c4eed3a3619ffc8beff30b3ec0f':
  Revise VpnService to use new vpn.* properties.
 2009-07-02 14:25:41 -07:00
Amith Yamasani
426cc62598 Make backup agent run in the system process as well. 2009-07-02 14:25:21 -07:00
Amith Yamasani
16d79e56ca Backup Wifi supplicant data. 
WifiService requests a backup when it writes wifi configuration to disk.
Backup the wifi supplicant file when settings provider runs backup.
 2009-07-02 12:05:32 -07:00
Amith Yamasani
220f4d633b System and Secure settings backup. 
This backs up the basic system and secure settings. THe restoration doesn't
take effect immediately. You many need to restart the runtime to see all
restored values take effect.
 2009-07-02 04:58:09 -07:00
Android (Google) Code Review
f83d7785d2 am f9eca3d4: Merge change 5807 into donut 
Merge commit 'f9eca3d43aed870774633a176aa691d3e530a12b'

* commit 'f9eca3d43aed870774633a176aa691d3e530a12b':
  Fixing synth to file to use the speech queue.
 2009-07-01 22:44:02 -07:00
Dianne Hackborn
cf098294da Move backup state to settings, change permission checks to use symbol. 
This changes the backup service to use the settings provider instead
of system properties, correspondingly making it off by default and
allowing specific devices to define the transport.  Also tweaks
the permission checks to use the permission symbol instead of raw
strings.

This requires some corresponding changes in the vendor projects.
 2009-07-01 20:12:36 -07:00