Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,123 Commits 3 Branches 0 Tags
1d6ec76f0808c082fbffbad21fecbb612eb5c76f
Commit Graph

4123 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android (Google) Code Review
1d6ec76f08 am 9479a516: Merge change 6154 into donut 
Merge commit '9479a516cffd990ed3dfc209c5e768f4fb447812'

* commit '9479a516cffd990ed3dfc209c5e768f4fb447812':
  Fix bug (#1947162)
 2009-07-06 12:00:23 -07:00
Android (Google) Code Review
707f1d777a am 70421cf6: Merge change 6237 into donut 
Merge commit '70421cf6b4e415fd6ce2b3bd55f945dc13b6306c'

* commit '70421cf6b4e415fd6ce2b3bd55f945dc13b6306c':
  Add a silent ringtone.
 2009-07-06 12:00:20 -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
Android (Google) Code Review
6231e3a778 am ef1f21b3: Merge change 6231 into donut 
Merge commit 'ef1f21b34f5624adb7436d3da927660ed16c97c7'

* commit 'ef1f21b34f5624adb7436d3da927660ed16c97c7':
  Don't trim() in the mediascanner, as that would remove the special "sort first" character.
 2009-07-06 12:00:12 -07:00
Android (Google) Code Review
19c9137441 am 8ad422ad: Merge change 6221 into donut 
Merge commit '8ad422adaf2eb5d36e0391fcc2cd30a226cf87ab'

* commit '8ad422adaf2eb5d36e0391fcc2cd30a226cf87ab':
  Remove links to wikipedia; fix typo; remove .vsd file (bug 1918247).
 2009-07-06 12:00:08 -07:00
Marco Nelissen
513d8068b4 am 899725b0: Make sure ringtones are sorted correctly. 
Merge commit '899725b05dd5c8c51f9f802d4f0a7190532ce0a5'

* commit '899725b05dd5c8c51f9f802d4f0a7190532ce0a5':
  Make sure ringtones are sorted correctly.
 2009-07-06 12:00:02 -07:00
Marco Nelissen
ff7d0e2bcc am 816cf52a: 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 a 
Merge commit '816cf52abd8f45770f0ac922bbb819184ed4b90f'

* commit '816cf52abd8f45770f0ac922bbb819184ed4b90f':
  Fix the DEFAULT_SORT_ORDER value for media files. Changing this
 2009-07-06 11:54:24 -07:00
Android (Google) Code Review
9479a516cf Merge change 6154 into donut 
* changes:
  Fix bug (#1947162)
 2009-07-06 11:37:13 -07:00
Android (Google) Code Review
70421cf6b4 Merge change 6237 into donut 
* changes:
  Add a silent ringtone.
 2009-07-06 11:34:28 -07:00
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
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