10339 Commits

Author SHA1 Message Date
Christian Mehlmauer
746a95ab71 Removed Calls to deprecated APIs
Change-Id: I3f9b6a8d3c8a050156a6cc7ea0eb9de33b82f79a
2010-05-17 21:16:20 +02:00
Kenny Root
8ea405d196 am cfa2de30: Import revised translations
Merge commit 'cfa2de303e58b971e334363356d29601e61d11c8' into froyo-plus-aosp

* commit 'cfa2de303e58b971e334363356d29601e61d11c8':
  Import revised translations
2010-05-17 11:37:35 -07:00
Kenny Root
cfa2de303e Import revised translations
Change-Id: Id6bd3011874ff8544a030473cc994f9a0201c97d
2010-05-17 11:18:04 -07:00
The Android Open Source Project
f7fb5331e5 merge from open-source master
Change-Id: Ia0201ec7be4c112569b8775429d1c9674eb3b661
2010-05-17 08:56:54 -07:00
Romain Guy
c4fee63301 Merge "Fixing indeterminate progress bar animation state." 2010-05-15 12:34:05 -07:00
David Sobreira Marques
52a35433cf Fixing indeterminate progress bar animation state.
When showing a progress bar instance more than once
it will not animate after the first time.

Change-Id: I5104c551d561755005e533f2ab5257454567bf71
Signed-off-by: David Sobreira Marques <dpsmarques@gmail.com>
2010-05-15 16:10:18 -03:00
Henrik Baard
e00c5ca431 Adding mimetypes to the mimetype map used in the web view
Sometimes a web server reports a faulty mime type, usually when the mimetype for this
type of content is not configured on the server. In this case the server might report
text/plain as the mime type.

When this ocurrs the phone opens this content as plain text inline in the browser instead
of asking system if this is supported by any application.

This is the case for the following mime types:

"XMF" which MIMEtype is "audio/midi"
"MXMF" which MIMEtype is "audio/mobile-xmf"
"AMR" which MIMEtype is "audio/amr"

By adding these MimeTypes to the lookup table in the browser it is possible to guess the
real mime type based on the file extension, and asks the system for support for the
mimtype in the table, fixing the problem.

Change-Id: I88bb37e4a6d66e68d7e26cb96bb9404175b33b68
2010-05-14 14:00:25 -07:00
Scott Main
6d8e4fd83b am b83a283a: docs: add dev guide for backup
Merge commit 'b83a283ac178ab0a72f1d811189d79b26097835e' into froyo-plus-aosp

* commit 'b83a283ac178ab0a72f1d811189d79b26097835e':
  docs: add dev guide for backup
2010-05-14 11:53:44 -07:00
Scott Main
b83a283ac1 docs: add dev guide for backup
Change-Id: I168f6b15d3441c9cbea2cd9699612476c7244530
2010-05-14 11:47:42 -07:00
The Android Open Source Project
9167ba50e4 merge from open-source master
Change-Id: I57f108d2b3415eddb0b20a4a9dec4c44285de226
2010-05-14 09:11:31 -07:00
Joe Onorato
1b44ebda70 Merge "Put the wifi status icon in the right place." 2010-05-13 16:33:22 -07:00
Suchi Amalapurapu
b63ea5f784 am c928a11e: Merge "Fix 2672155 Check the code path when enabling disabling packages." into froyo
Merge commit 'c928a11e34678296511d5ea34582292be7368618' into froyo-plus-aosp

* commit 'c928a11e34678296511d5ea34582292be7368618':
  Fix 2672155
2010-05-13 16:04:24 -07:00
Suchi Amalapurapu
c928a11e34 Merge "Fix 2672155 Check the code path when enabling disabling packages." into froyo 2010-05-13 16:02:20 -07:00
Suchi Amalapurapu
1ace5bc070 Fix 2672155
Check the code path when enabling disabling packages.

Add unit test

Change-Id: I0f0f482a3735234eab3f63ba1f6462574b70144e
2010-05-13 15:48:39 -07:00
The Android Open Source Project
b1110149cc merge from open-source master
Change-Id: I88a580162b34a80d1e3e7987b7a301c253afa0e8
2010-05-13 14:50:16 -07:00
Mike Lockwood
a3d5549c80 am 098e58da: Use SystemClock.elapsedRealtime in ShutdownThread timeout logic
Merge commit '098e58da93f304d7d7791f193c6237870b94989d' into froyo-plus-aosp

* commit '098e58da93f304d7d7791f193c6237870b94989d':
  Use SystemClock.elapsedRealtime in ShutdownThread timeout logic
2010-05-13 14:04:30 -07:00
Mike Lockwood
098e58da93 Use SystemClock.elapsedRealtime in ShutdownThread timeout logic
This avoids problems if the time is reset while shutting down.

Change-Id: I54c7c787e55648ebf5a68e79056f92fbac0081ae
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-05-13 16:29:49 -04:00
Kenny Root
b79781af1e Use integer for loop counter instead of float
Change-Id: Iafaccbb3a3a7cbe0d67ed6827906d713c37ce89b
2010-05-13 12:17:15 -07:00
The Android Open Source Project
1a3b3d4841 merge from open-source master
Change-Id: I51b4eccfde8e74c69ab8e0c051bb8ea718ee7101
2010-05-13 09:04:45 -07:00
Costin Manolache
fa2e3dcd85 am 8ea9f130: Merge "Bug 2680071: Rename the Cloud to Device" into froyo
Merge commit '8ea9f130d24a7dd1e505ba0cf437bdd8a660975e' into froyo-plus-aosp

* commit '8ea9f130d24a7dd1e505ba0cf437bdd8a660975e':
  Bug 2680071: Rename the Cloud to Device
2010-05-12 19:06:39 -07:00
Costin Manolache
8ea9f130d2 Merge "Bug 2680071: Rename the Cloud to Device" into froyo 2010-05-12 19:04:27 -07:00
Jeff Hamilton
f3ca9a5c7e Add some documentation about the thread safety of Cursor and some of the SQLite* classes.
Change-Id: Icae51052d1c942d7d60bb958d3703411da001079
2010-05-12 16:44:19 -07:00
Costin Manolache
8d83f9e31b Bug 2680071: Rename the Cloud to Device
Change-Id: I12ab32de393e44a499e3f9e3a0b38f4682156ff5
2010-05-12 16:16:34 -07:00
Grace Kloba
bfc63c7b83 am 336d7dcb: The default AlertDialog allows cancel. But the default JSConfim doesn\'t have a cancel listener. So when user cancel the dialog, we do not wake up the WebCoreThread. The same code is already done for JSPrompt dialog correctly.
Merge commit '336d7dcb105a43ee4de51fd0f26f277c63662f02' into froyo-plus-aosp

* commit '336d7dcb105a43ee4de51fd0f26f277c63662f02':
  The default AlertDialog allows cancel. But the default
2010-05-12 15:33:30 -07:00
The Android Open Source Project
4adacd23d4 merge from open-source master
Change-Id: If6730b50627b2231bd345e594d8d30a37557849e
2010-05-12 14:53:25 -07:00
Grace Kloba
336d7dcb10 The default AlertDialog allows cancel. But the default
JSConfim doesn't have a cancel listener. So when
user cancel the dialog, we do not wake up the WebCoreThread.
The same code is already done for JSPrompt dialog correctly.

Fix http://b/issue?id=2679139
2010-05-12 14:28:07 -07:00
The Android Open Source Project
7d9526445c merge from open-source master
Change-Id: Ib5ea9745c2b652d64646e3e28c12e63815321ff9
2010-05-12 14:10:23 -07:00
Costin Manolache
625de48897 am e2055fe4: Merge "Bug 2673557: rename datamessaging" into froyo
Merge commit 'e2055fe4258f8085a88328579c852ec26d77bb10' into froyo-plus-aosp

* commit 'e2055fe4258f8085a88328579c852ec26d77bb10':
  Bug 2673557: rename datamessaging
2010-05-12 07:49:16 -07:00
Costin Manolache
e2055fe425 Merge "Bug 2673557: rename datamessaging" into froyo 2010-05-11 11:42:58 -07:00
Keith Ito
a8d8cb12b3 am be65399b: Merge "Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter" into froyo
Merge commit 'be65399baf23855094596e27c25763ff92e9e027' into froyo-plus-aosp

* commit 'be65399baf23855094596e27c25763ff92e9e027':
  Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter
2010-05-11 10:19:06 -07:00
Nicolas Roard
373b4913ab am f78acacb: Fix the \'wobbling fixed elements\' bug. Cherry-picked from master. This CL has a corresponding C++ counterpart (https://android-git.corp.google.com/g/#change,51149)
Merge commit 'f78acacb0d7a8e4d9e85a1cd6eed0f6bb38d6776' into froyo-plus-aosp

* commit 'f78acacb0d7a8e4d9e85a1cd6eed0f6bb38d6776':
  Fix the 'wobbling fixed elements' bug.
2010-05-11 10:18:59 -07:00
Dianne Hackborn
7e76b6d191 am 6d00151c: Merge "Hopefully fix issue #2662536: Why is launcher being killed?" into froyo
Merge commit '6d00151c519d5c131cc1480978fe4417cc7bcc79' into froyo-plus-aosp

* commit '6d00151c519d5c131cc1480978fe4417cc7bcc79':
  Hopefully fix issue #2662536: Why is launcher being killed?
2010-05-11 10:18:55 -07:00
Jim Miller
4d89954dc4 am a2757901: Merge "Fix 2660488: Add LockScreen/InCallScreen resources to preloads" into froyo
Merge commit 'a27579016caf1438400a3637e3896bec653e3756' into froyo-plus-aosp

* commit 'a27579016caf1438400a3637e3896bec653e3756':
  Fix 2660488: Add LockScreen/InCallScreen resources to preloads
2010-05-11 10:18:38 -07:00
Naveen Kalla
0a5174a6e9 Add support for EVDO Rev B
Change-Id: I8588e8b342c51f4b79bced8ef8fe60d57f07aefa
2010-05-11 10:12:07 -07:00
Naveen Kalla
18573e9281 Support to display message when operation is blocked due to FDN being enabled
The terminal disallows USSD, SMS, Voice Call and Supplementary services
operations for numbers not in the Fixed Dialing Number (FDN) list when the
FDN service is enabled. FDN_CHECK_FAILURE error is sent from the RIL and the
message needs to be displayed to indicate the failure.

Change-Id: I49bd63f69a3f0201125b17cd16db2e8fcf93ddc3
2010-05-11 09:12:00 -07:00
Keith Ito
be65399baf Merge "Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter" into froyo 2010-05-10 20:41:47 -07:00
Nicolas Roard
f78acacb0d Fix the 'wobbling fixed elements' bug.
Cherry-picked from master.
This CL has a corresponding C++ counterpart (https://android-git.corp.google.com/g/#change,51149)

Bug:2665696
Change-Id: I0a044661ff21ef601ba34782db8acdc9531f98e7
2010-05-10 19:31:54 -07:00
Costin Manolache
161c75a0f3 Bug 2673557: rename datamessaging
Change-Id: I583ac61c7b8fce69d60801dc76aeca9f13d250b2
2010-05-10 19:12:49 -07:00
Keith Ito
9114a8bb8b Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter
Change-Id: I10b02306478d9c595dbcae0767b44c403d50e24a
2010-05-10 18:27:23 -07:00
Dianne Hackborn
6d00151c51 Merge "Hopefully fix issue #2662536: Why is launcher being killed?" into froyo 2010-05-10 17:27:14 -07:00
Dianne Hackborn
906497c574 Hopefully fix issue #2662536: Why is launcher being killed?
It looks like there was a subtle bug where Process.setOomAdj() could
return false just because the given process doesn't exist, even though
it is documented to only return false if OOM killing is not supported
at all.  This would cause the activity manager to fall into its code
path of trying to clean up processes itself, which it does a much
poorer problem at.  I am thinking we may be seeing this problem more
now that the activity manager is killing background processes itself
when there are too many of them.

In addition, this change cleans up and reduces some of the logging
around killing processes.

Finally, try to improve process LRU management a bit by taking
into account process dependencies.  Any dependent processes are
pulled up in the LRU list with the processes that is actually
moving.  Also, we bring a process up if someone accesses its content
provider.

Change-Id: I34ea161f839679345578ffe681e8d9c5d26ab948
2010-05-10 17:19:58 -07:00
Jim Miller
a27579016c Merge "Fix 2660488: Add LockScreen/InCallScreen resources to preloads" into froyo 2010-05-10 15:55:41 -07:00
Jim Miller
7d38886ba6 Fix 2660488: Add LockScreen/InCallScreen resources to preloads
This adds the base SlidinTab drawable resources shared by
InCallScreen and LockScreen into the zygote process. It should
save approximately 375kB (mdpi) and 825kB (hdpi) of RAM by
sharing resource between the LockScreen and InCallScreen.

Change-Id: I05bcafa894ed27d419b171ad5041bd83134461f7
2010-05-10 15:24:47 -07:00
Robert Greenwalt
c8d1556fb8 am b74a239f: Merge "String change to refer to wifi tether as hotspot" into froyo
Merge commit 'b74a239fd2e729c41b0cb87cbc606530ed631a41' into froyo-plus-aosp

* commit 'b74a239fd2e729c41b0cb87cbc606530ed631a41':
  String change to refer to wifi tether as hotspot
2010-05-10 10:12:58 -07:00
Robert Greenwalt
b74a239fd2 Merge "String change to refer to wifi tether as hotspot" into froyo 2010-05-10 10:11:12 -07:00
Dan Egnor
5610c2871b am 7d167376: Merge "Add unit test for passing thread priority & cgroup through Binder." into froyo
Merge commit '7d16737668685b5b4e6158a6ff6f79a92ed3b4d9' into froyo-plus-aosp

* commit '7d16737668685b5b4e6158a6ff6f79a92ed3b4d9':
  Add unit test for passing thread priority & cgroup through Binder.
2010-05-10 09:43:53 -07:00
Dan Egnor
7d16737668 Merge "Add unit test for passing thread priority & cgroup through Binder." into froyo 2010-05-09 07:03:46 -07:00
Robert Greenwalt
ebdbc7ec11 String change to refer to wifi tether as hotspot
bug:2664412
Change-Id: I9ab110f88551d03a9215b81887675c50aa575d9a
2010-05-08 15:07:53 -07:00
Dan Egnor
43fe81bc2c Add unit test for passing thread priority & cgroup through Binder.
This test actually exposes some bugs -- the test passes as written, but
certain parts are commented out with references to the bugs in question.

Bug: 2665914
Bug: 2665954
Change-Id: I61220e0efadc4edbb6ad419d26fa1f0f50bbc24c
2010-05-07 09:32:54 -07:00
Bjorn Bringert
c8170ee205 am 75370e74: Merge "Fixing: RecognitionService logcat spam "cancel called..."" into froyo
Merge commit '75370e74629b4938c4472d6001eebf5e305dbc55' into froyo-plus-aosp

* commit '75370e74629b4938c4472d6001eebf5e305dbc55':
  Fixing: RecognitionService logcat spam "cancel called..."
2010-05-07 03:40:31 -07:00