4272 Commits

Author SHA1 Message Date
Marco Nelissen
a6e45b4bb3 Add a silent ringtone. 2009-07-06 11:33:06 -07:00
The Android Open Source Project
c8f800edb2 Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base 2009-07-06 11:31:10 -07:00
James Dong
aa00e390c1 Fix bug (#1947162)
The bug (1947162) is caused by the fact that sometimes, surfaceChanged() is called after onCompletion().
In surfaceChanged(), start() is called automatically. The fix is to use a flag is avoid calling start()
when onCompletion() has been called already.
2009-07-06 11:30:29 -07:00
Android (Google) Code Review
87e393f1c8 Merge change 6227 into donut
* changes:
  Adding tts result codes.
2009-07-06 11:26:15 -07:00
Android (Google) Code Review
a95fe061c7 Merge change 6232
* changes:
  frameworks/base: Update mPdu in createFromPdu
2009-07-06 11:22:51 -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
71830eaeda am 3383df38: Merge change 6198 into donut
Merge commit '3383df385e208807b1dc5f2956f82a7f75f65fd8'

* commit '3383df385e208807b1dc5f2956f82a7f75f65fd8':
  keystore: Provide a generic getter for native components.
2009-07-06 11:22:25 -07:00
Chung-yih Wang
58c714c41a am 699ca3f2: Add password field for WiFi configuration.
Merge commit '699ca3f2518360ea3250ff5a0e5d39e122c64a91'

* commit '699ca3f2518360ea3250ff5a0e5d39e122c64a91':
  Add password field for WiFi configuration.
2009-07-06 11:22:18 -07:00
Android (Google) Code Review
f6a6cff234 am 4492bcb8: Merge change 6081 into donut
Merge commit '4492bcb851f4ee862a446664eb9045045ebb7b5e'

* commit '4492bcb851f4ee862a446664eb9045045ebb7b5e':
  Migrate to the CertTool library.
2009-07-06 11:22:11 -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
Android (Google) Code Review
522ea0d689 am 24ad29c6: Merge change 6177 into donut
Merge commit '24ad29c6dbbf62096bcb41ddb2fa3975720ee625'

* commit '24ad29c6dbbf62096bcb41ddb2fa3975720ee625':
  Two small checks in keymgmt.
2009-07-06 11:21:59 -07:00
Android (Google) Code Review
f8ef6209b5 am 7b8f782e: Merge change 6183 into donut
Merge commit '7b8f782eaaef392154fe3acd3ffb48c0a81024e9'

* commit '7b8f782eaaef392154fe3acd3ffb48c0a81024e9':
  Fix null data handling in ServiceCommand.writeCommand()
2009-07-06 11:21:50 -07:00
Android (Google) Code Review
605c983524 am 2f97e984: (-s ours) Merge change 6130 into donut
Merge commit '2f97e984b52b243a5433596c8c291f35778d6b38'

* commit '2f97e984b52b243a5433596c8c291f35778d6b38':
  Make backup agent run in the system process as well.
2009-07-06 11:21:45 -07:00
Android (Google) Code Review
907a8589ba am 922f1b85: Merge change 6146 into donut
Merge commit '922f1b85b9096d9056f1b9e2d777098d1e4ed8b1'

* commit '922f1b85b9096d9056f1b9e2d777098d1e4ed8b1':
  Fixing 1949086 Sholes telephony crash after waking from sleep.
2009-07-06 11:17:56 -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
Android (Google) Code Review
ce7dd2a56c am b29f8283: Merge change 6155 into donut
Merge commit 'b29f8283d06c2ab4eb54c991d7ffb5181d91af15'

* commit 'b29f8283d06c2ab4eb54c991d7ffb5181d91af15':
  Unhide android.speech.tts.TextToSpeech
2009-07-06 11:17:34 -07:00
Android (Google) Code Review
4753ff4466 am 7e8cbfc2: Merge change 6143 into donut
Merge commit '7e8cbfc2bc3ea2334c38db7fd2b6a1e17eefcac6'

* commit '7e8cbfc2bc3ea2334c38db7fd2b6a1e17eefcac6':
  Fix the simulator.
2009-07-06 11:17:12 -07:00
Christopher Tate
80f4913d76 am d23d7f2d: Add a \'wipe\' operation to Bmgr
Merge commit 'd23d7f2d12c20314e1e8ff206fafc8f21745ca2d'

* commit 'd23d7f2d12c20314e1e8ff206fafc8f21745ca2d':
  Add a 'wipe' operation to Bmgr
2009-07-06 11:17:02 -07:00
Android (Google) Code Review
3d20432649 am e15df401: Merge change 6132 into donut
Merge commit 'e15df4017c3625de700e9f9953073f38898bbc89'

* commit 'e15df4017c3625de700e9f9953073f38898bbc89':
  If we can't get the restore set's metadata, don't continue
2009-07-06 11:16:58 -07:00
Android (Google) Code Review
85c216794d am fe11ea5e: Merge change 6126 into donut
Merge commit 'fe11ea5e2df4a4414aa266e93179c3098b03a795'

* commit 'fe11ea5e2df4a4414aa266e93179c3098b03a795':
  Use 'LOCAL_PATH' instead of 'local_path', so it's easier to see a diff of the two .mk files.
2009-07-06 11:16:48 -07:00
Android (Google) Code Review
a5c2d1128b am 0d81f636: (-s ours) Merge change 6102 into donut
Merge commit '0d81f6368708b1faa42a3bb6413210e01fea9222'

* commit '0d81f6368708b1faa42a3bb6413210e01fea9222':
  Backup Wifi supplicant data.
2009-07-06 11:16:34 -07:00
Dianne Hackborn
78c405178c Don't re-parse the framework resources all the time.
A small optimization to the resource code, to not re-parse the framework
resources every time we build a new AssetManager.  Instead, you can now
construct a ResTable from a previously created one...  of course, like the
existing code for using the data in-place, you can't delete the original
ResTable until you have deleted the one that has been constructed from it.
2009-07-06 11:12:37 -07:00
Android (Google) Code Review
ef1f21b34f Merge change 6231 into donut
* changes:
  Don't trim() in the mediascanner, as that would remove the special "sort first" character.
2009-07-06 11:09:20 -07:00
Patrick Scott
0a5ce01eda Basic changes to get embedded video working.
Add the ViewManager class to handle child views within a WebView. This class
attaches and removes the views in the UI thread. It also scales the layout
params based on the scale of the WebView.
2009-07-06 14:08:45 -04:00
Marco Nelissen
73bb511ade Don't trim() in the mediascanner, as that would remove the special "sort first" character. 2009-07-06 11:07:27 -07:00
Android (Google) Code Review
3042bb6238 am 9701b3d5: Merge change 5979 into donut
Merge commit '9701b3d594868bd6750d5887af560c6295ea091b'

* commit '9701b3d594868bd6750d5887af560c6295ea091b':
  Remove the constraint to assign new uid when code path changes for system packages
2009-07-06 11:02:59 -07:00
Christopher Tate
f77b4112ea am 4e3e50cf: Clean up the last two literal permission string usages
Merge commit '4e3e50cfa7cf02270ed0dd454d5c51bf7065bd14'

* commit '4e3e50cfa7cf02270ed0dd454d5c51bf7065bd14':
  Clean up the last two literal permission string usages
2009-07-06 11:02:55 -07:00
Android (Google) Code Review
0a04ca7c97 am 7c5ae202: Merge change 6104 into donut
Merge commit '7c5ae202c53be1ab4881a6811aa5bd091c3aef10'

* commit '7c5ae202c53be1ab4881a6811aa5bd091c3aef10':
  Add a "clear backed-up data" method to the backup mechanism
2009-07-06 11:02:50 -07:00
Android (Google) Code Review
6375cf73a6 am a642e313: Merge change 6090 into donut
Merge commit 'a642e313988ec7f9e732ead00edbded8b57d7452'

* commit 'a642e313988ec7f9e732ead00edbded8b57d7452':
  Adding strings for data root and data files - these are needed
2009-07-06 11:02:40 -07:00
Android (Google) Code Review
fee47b699f am c7396025: Merge change 6084 into donut
Merge commit 'c7396025e59524e7ef639fd86fc23123939ee91c'

* commit 'c7396025e59524e7ef639fd86fc23123939ee91c':
  Return CAMERA_ERROR_SERVER_DIED to camera app when camera service dies (bug 1956726)
2009-07-06 11:02:33 -07:00
Android (Google) Code Review
1eebdc04f0 am d3de90f3: Merge change 5995 into donut
Merge commit 'd3de90f38d779d28a724e89297c83e6ba1a66fa7'

* commit 'd3de90f38d779d28a724e89297c83e6ba1a66fa7':
  Turn off kerning when testing TextUtils.ellipsize().
2009-07-06 11:02:25 -07:00
Android (Google) Code Review
8ad422adaf Merge change 6221 into donut
* changes:
  Remove links to wikipedia; fix typo; remove .vsd file (bug 1918247).
2009-07-06 11:01:43 -07:00
Marco Nelissen
899725b05d Make sure ringtones are sorted correctly. 2009-07-06 10:57:01 -07:00
Charles Chen
35b86c273a Adding tts result codes. 2009-07-06 10:51:48 -07:00
Android (Google) Code Review
ae596082b5 Merge change 6159
* changes:
  Add the code to detect how long the WebViewCore thread is idle in the real time.
2009-07-06 10:29:41 -07:00
Android (Google) Code Review
9bd224481e Merge change 6144
* changes:
  Fix the performance collection in the http thread. A connection can be reused. Change the thread time collection based on per request.
2009-07-06 10:29:08 -07:00
Katarina Stenstedt
014a59bf40 Remove links to wikipedia; fix typo; remove .vsd file (bug 1918247). 2009-07-06 10:10:19 -07:00
Marco Nelissen
816cf52abd Fix the DEFAULT_SORT_ORDER value for media files. Changing this
is OK, because existing app will have the old value compiled in
as a literal, and so will continue to (not) work in the same
way as before. Add code to media key generator to give a leading
ascii \001 the special meaning of "sort first".
2009-07-06 09:58:06 -07:00
Satish Roddom
5082fd58e3 frameworks/base: Update mPdu in createFromPdu
Inside createFromPdu(), the passed-in parameter 'pdu' is assigned
to msg.mPdu, so that we can call getPdu() to get it back.
2009-07-06 09:36:11 -07:00
Android (Google) Code Review
fca3ae1517 am 3bc64a2c: Merge change 6088 into donut
Merge commit '3bc64a2cb97da7bf7dc203416ad6c7d86c5925fc'

* commit '3bc64a2cb97da7bf7dc203416ad6c7d86c5925fc':
  WifiManager: Limit the number of WifiLocks that can be active simultaneously.
2009-07-06 09:12:56 -07:00
Android (Google) Code Review
699379f974 Merge change 6071
* changes:
  In WebTextView, check the focus before sending a key.
2009-07-06 08:49:19 -07:00
Hung-ying Tyan
46841db4f2 Add PPTP and L2TP/IPSec PSK service dispatching 2009-07-06 23:38:48 +08:00
Leon Scroggins
4890feb048 In WebTextView, check the focus before sending a key.
This fixes a bug where the DOM has moved the focus, but the WebTextView
is still sending keys to the old focus.  Requires a change in
external/webkit.
2009-07-06 11:15:07 -04:00
Patrick Scott
18dd5f0d25 Improve the Vibrator service by keeping track of multiple vibration requests.
There are 2 types of vibrations: simple and repeated. Simple vibrations run for
a given length of time while repeated patterns run until canceled or the calling
process dies.

If a vibration is currently running and another request is issued, the newer
request always takes precedence unless the current vibration is a simple one and
the time left is longer than the new request.

If a repeating vibration is running and a new request overrides that vibration,
the current vibration is pushed onto a stack. Once the new vibration completes,
the previous vibration resumes. IBinder tokens are used to identify Vibration
requests which means that multiple calls to Vibrator.vibrate with the same
Vibrator object will override previous vibrations on that object.
2009-07-06 08:31:33 -04:00
Android (Google) Code Review
1f2bb46b9a Merge change 6204 into donut
* changes:
  Migrate to new keystore with the CertTool lib.
2009-07-06 03:55:07 -07:00
Hung-ying Tyan
7d22e15e1b Migrate to new keystore with the CertTool lib. 2009-07-06 17:12:53 +08:00
Android (Google) Code Review
3383df385e Merge change 6198 into donut
* changes:
  keystore: Provide a generic getter for native components.
2009-07-06 00:04:54 -07:00
Chia-chi Yeh
fd70bed692 keystore: Provide a generic getter for native components. 2009-07-06 14:33:09 +08:00
Chung-yih Wang
699ca3f251 Add password field for WiFi configuration.
1. the certtool.h is modified for avoiding the side effect,
   for saving the configuration with wpa_supplicant.
2. put the loadLibrary back in CertTool.java
3. Fix incorrect JNI declarations.
2009-07-05 11:06:01 +08:00