Commit Graph

6304 Commits

Author SHA1 Message Date
Dianne Hackborn
9f9a2dc801 am ee110be0: Fix issue #2179891: Need to update 5.xml
Merge commit 'ee110be02256b816ac6d863e39cb8b11b8071baa' into eclair-plus-aosp

* commit 'ee110be02256b816ac6d863e39cb8b11b8071baa':
  Fix issue #2179891: Need to update 5.xml
2009-10-09 17:39:26 -07:00
Romain Guy
2cf1932615 am 8eb955b9: Merge change I5e482bbc into eclair
Merge commit '8eb955b934c49ce814bce1a84bc995eef849051d' into eclair-plus-aosp

* commit '8eb955b934c49ce814bce1a84bc995eef849051d':
  Add new RenderScript sample: ImageProcessing.
2009-10-09 16:13:18 -07:00
Eric Fischer
9eb928c066 am c08efb27: Import revised translations. DO NOT MERGE
Merge commit 'c08efb2712fbcc25ce9c208f3c9d7c0935e209d4' into eclair-plus-aosp

* commit 'c08efb2712fbcc25ce9c208f3c9d7c0935e209d4':
  Import revised translations.  DO NOT MERGE
2009-10-09 16:08:02 -07:00
Android (Google) Code Review
ff86952114 Merge change I5e482bbc into eclair
* changes:
  Add new RenderScript sample: ImageProcessing.
2009-10-09 19:07:12 -04:00
Robert Greenwalt
6c319bcd7b am 98e0b146: Make PhoneStateListeners not call TelephonyManager
Merge commit '98e0b146b80670b52805b4b210ef5582dad6bb68' into eclair-plus-aosp

* commit '98e0b146b80670b52805b4b210ef5582dad6bb68':
  Make PhoneStateListeners not call TelephonyManager
2009-10-09 01:22:57 -07:00
Grace Kloba
d4460df4a5 am 1184313c: Setting WebCore cache limit depending on the memory class.
Merge commit '1184313cbea3b34a4596a90be7081551d36f251a' into eclair-plus-aosp

* commit '1184313cbea3b34a4596a90be7081551d36f251a':
  Setting WebCore cache limit depending on the memory class.
2009-10-09 00:10:32 -07:00
Dan Egnor
7184c6c878 am 6903d5ce: Merge change Iee649a81 into eclair
Merge commit '6903d5cedcffa005818c497f672cf16c2dff619c' into eclair-plus-aosp

* commit '6903d5cedcffa005818c497f672cf16c2dff619c':
  Add LAST_KMSG_KB variable, used to tune the size of /proc/last_kmsg uploads.
2009-10-08 20:25:10 -07:00
Android (Google) Code Review
9888bb6eb6 Merge change Iee649a81 into eclair
* changes:
  Add LAST_KMSG_KB variable, used to tune the size of /proc/last_kmsg uploads. See bug 2177046.
2009-10-08 23:19:03 -04:00
Jim Miller
e0dd7471ac am ad60e7fe: Merge change I9485aec1 into eclair
Merge commit 'ad60e7fe2c9588cd16c1351419af90964beb232d' into eclair-plus-aosp

* commit 'ad60e7fe2c9588cd16c1351419af90964beb232d':
  Fix for 2177367: Reduce duration of vibrate in RotaryLockScreen
2009-10-08 19:09:44 -07:00
Dianne Hackborn
26bed50491 am 2c6c5e6e: Fix issue #2176944: Need API so browser, others can determine memory size of device
Merge commit '2c6c5e6e49795e6e24cd089c9018377d837ba931' into eclair-plus-aosp

* commit '2c6c5e6e49795e6e24cd089c9018377d837ba931':
  Fix issue #2176944: Need API so browser, others can determine memory size of device
2009-10-08 19:09:38 -07:00
Android (Google) Code Review
db62e0610d Merge change I9485aec1 into eclair
* changes:
  Fix for 2177367: Reduce duration of vibrate in RotaryLockScreen
2009-10-08 22:04:36 -04:00
Dianne Hackborn
15b84bc783 am d10d02f5: Merge change I490e01ba into eclair
Merge commit 'd10d02f53ec00bfa9eb9f5accf6454e4a4bbb6a6' into eclair-plus-aosp

* commit 'd10d02f53ec00bfa9eb9f5accf6454e4a4bbb6a6':
  Fix issue #2174566: HOT STABILITY: NPE in activity manager
2009-10-08 18:43:54 -07:00
Dianne Hackborn
d6dd1d771c am 89becd79: Fix issue #2177262: Improve animations
Merge commit '89becd79da643421adc2dbb0cdccc547a0611abb' into eclair-plus-aosp

* commit '89becd79da643421adc2dbb0cdccc547a0611abb':
  Fix issue #2177262: Improve animations
2009-10-08 18:43:48 -07:00
Android (Google) Code Review
eb14967436 Merge change I490e01ba into eclair
* changes:
  Fix issue #2174566: HOT STABILITY: NPE in activity manager
2009-10-08 21:38:39 -04:00
Dianne Hackborn
aeaadae27e am 9e2562b8: Merge change I88c6e267 into eclair
Merge commit '9e2562b8f97fec7e13e6302678459e99b8cccb2a' into eclair-plus-aosp

* commit '9e2562b8f97fec7e13e6302678459e99b8cccb2a':
  Fix issue #2175693: Add vmallocinfo to dumpstate
2009-10-08 16:58:20 -07:00
Android (Google) Code Review
d2f518f5a0 Merge change I88c6e267 into eclair
* changes:
  Fix issue #2175693: Add vmallocinfo to dumpstate
2009-10-08 19:52:35 -04:00
Nick Pelly
79cfdea9f5 am db7ae10d: Remove STOPSHIP BT logging.
Merge commit 'db7ae10d6b8e86ff5311512de45afa65a1b0a738' into eclair-plus-aosp

* commit 'db7ae10d6b8e86ff5311512de45afa65a1b0a738':
  Remove STOPSHIP BT logging.
2009-10-08 16:47:19 -07:00
Nick Pelly
9debdac64d am e6ee3be1: BT API security audit: fix a couple of permission mistakes.
Merge commit 'e6ee3be1c254404dad842298f6f56c11cc6c7ac8' into eclair-plus-aosp

* commit 'e6ee3be1c254404dad842298f6f56c11cc6c7ac8':
  BT API security audit: fix a couple of permission mistakes.
2009-10-08 16:47:13 -07:00
Mathias Agopian
b13c02a3db am 846322a9: Merge change Ib96df854 into eclair
Merge commit '846322a9ae5ef8155cca0059d3f64d718516ca13' into eclair-plus-aosp

* commit '846322a9ae5ef8155cca0059d3f64d718516ca13':
  add a way to easily catch and log GL errors (compile time flag)
2009-10-08 16:20:45 -07:00
Android (Google) Code Review
39af502ccc Merge change Ib96df854 into eclair
* changes:
  add a way to easily catch and log GL errors (compile time flag)
2009-10-08 19:10:42 -04:00
Mathias Agopian
7d21a745ac add a way to easily catch and log GL errors (compile time flag) 2009-10-08 15:58:11 -07:00
Eric Fischer
5a61cdd675 am aaa6299b: am 24c8645a: (-s ours) Import revised translations. DO NOT MERGE
Merge commit 'aaa6299bcd1a44f5f066ef48fb99cc0a704cbd0f' into eclair-plus-aosp

* commit 'aaa6299bcd1a44f5f066ef48fb99cc0a704cbd0f':
  Import revised translations.  DO NOT MERGE
2009-10-08 15:10:38 -07:00
Jean-Baptiste Queru
b239a5f45d am ea110274: am ac62c84a: (-s ours) DO NOT MERGE merge from donut-gms
Merge commit 'ea11027401a6b0e8fc351b7585d929e8fdb3fd08' into eclair-plus-aosp

* commit 'ea11027401a6b0e8fc351b7585d929e8fdb3fd08':
  Import revised translations.  DO NOT MERGE
2009-10-08 15:10:32 -07:00
Mike Lockwood
41da9cdd7b am 348b92bd: Merge change Iee227ace into eclair
Merge commit '348b92bd513087369ac682e29620d7829fa1381b' into eclair-plus-aosp

* commit '348b92bd513087369ac682e29620d7829fa1381b':
  GPS: Fix problem with SUPL when SUPL APN is already active.
2009-10-08 15:10:25 -07:00
Eric Fischer
4b19ae1515 am 24c8645a: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '24c8645a995f58885fefcaade0681dd459452deb' into eclair

* commit '24c8645a995f58885fefcaade0681dd459452deb':
  Import revised translations.  DO NOT MERGE
2009-10-08 15:03:24 -07:00
Jean-Baptiste Queru
fa650335e1 am ac62c84a: (-s ours) DO NOT MERGE merge from donut-gms
Merge commit 'ac62c84a321e2720ab99e37724aba0b6406f39a6' into eclair

* commit 'ac62c84a321e2720ab99e37724aba0b6406f39a6':
  Import revised translations.  DO NOT MERGE
2009-10-08 15:03:15 -07:00
Android (Google) Code Review
e16e1b4d30 Merge change Iee227ace into eclair
* changes:
  GPS: Fix problem with SUPL when SUPL APN is already active.
2009-10-08 17:58:11 -04:00
Eric Laurent
a849a4eb27 am ff94720b: Merge change I80a6a229 into eclair
Merge commit 'ff94720b8bf9f83f326197cb0cb27576168e9448' into eclair-plus-aosp

* commit 'ff94720b8bf9f83f326197cb0cb27576168e9448':
  Fix issue 2174002: After rejecting Call when device ringtone is mute and playing music, audio is not transfered to BT device.
2009-10-08 14:47:26 -07:00
Android (Google) Code Review
a82fc0f21b Merge change I80a6a229 into eclair
* changes:
  Fix issue 2174002: After rejecting Call when device ringtone is mute and playing music, audio is not transfered to BT device.
2009-10-08 17:36:18 -04:00
Jaikumar Ganesh
079ff45224 am 9d5b5899: Merge change Ie5d93b7e into eclair
Merge commit '9d5b58991ef90e91b3c942c80ae3502ed62d10aa' into eclair-plus-aosp

* commit '9d5b58991ef90e91b3c942c80ae3502ed62d10aa':
  Set the Bond State to NONE when we receive a Agent Cancel.
2009-10-08 13:18:30 -07:00
Android (Google) Code Review
5b4617486a Merge change Ie5d93b7e into eclair
* changes:
  Set the Bond State to NONE when we receive a Agent Cancel.
2009-10-08 16:11:13 -04:00
Eric Laurent
2115412564 Fix issue 2174002: After rejecting Call when device ringtone is mute and playing music, audio is not transfered to BT device.
Added a workarouond to request the A2DP output standby directly to audio hardware when the sink is suspended as it seems that the suspend request often fails.

Also take into account resume requests received while a suspend request is pending.
2009-10-08 12:03:51 -07:00
John Wang
82dfa7a914 am 33e21fcc: Control H icon display in Status bar.
Merge commit '33e21fcc99dd91061ea245984c4e9a1544cb943f' into eclair-plus-aosp

* commit '33e21fcc99dd91061ea245984c4e9a1544cb943f':
  Control H icon display in Status bar.
2009-10-08 11:57:11 -07:00
Romain Guy
32fb50c4ff am 3b36ed09: Merge change I95319bde into eclair
Merge commit '3b36ed09293965e7e5dc20dfa514422388e796d6' into eclair-plus-aosp

* commit '3b36ed09293965e7e5dc20dfa514422388e796d6':
  Fixes #2175599. Prevents an NPE when AttachInfo is null.
2009-10-08 11:19:14 -07:00
Daisuke Miyakawa
d0bb635496 am 387e73bd: Merge change Ib977f2bd into eclair
Merge commit '387e73bd8fbecae0b95e3005ca8187ddbda1aff7' into eclair-plus-aosp

* commit '387e73bd8fbecae0b95e3005ca8187ddbda1aff7':
  Make vCard import Photo from vCard file :(
2009-10-08 11:19:08 -07:00
Android (Google) Code Review
d4bd259ba6 Merge change I95319bde into eclair
* changes:
  Fixes #2175599. Prevents an NPE when AttachInfo is null.
2009-10-08 13:53:54 -04:00
Android (Google) Code Review
6fc8f1c5e4 Merge change Ib977f2bd into eclair
* changes:
  Make vCard import Photo from vCard file :(
2009-10-08 13:49:39 -04:00
Joshua Bartel
7cf211b4a2 am bd324c9b: Merge change I50a321c9 into eclair
Merge commit 'bd324c9bd32a3c86634c1cc1ab8525f46a56b694' into eclair-plus-aosp

* commit 'bd324c9bd32a3c86634c1cc1ab8525f46a56b694':
  LocationManagerService: Fix race when removing LocationListener
2009-10-08 10:41:13 -07:00
Jean-Baptiste Queru
949a37e984 DO NOT MERGE merge from donut-gms 2009-10-08 10:00:40 -07:00
Android (Google) Code Review
b55acf4902 Merge change I50a321c9 into eclair
* changes:
  LocationManagerService: Fix race when removing LocationListener
2009-10-08 12:58:48 -04:00
San Mehat
2180faea50 am e9296876: Merge change Ib7c34cec into eclair
Merge commit 'e9296876140ba055d311f3f11af25beae652e6d8' into eclair-plus-aosp

* commit 'e9296876140ba055d311f3f11af25beae652e6d8':
  dumpstate: 'RAMCONSOLE' -> 'LAST KMSG'
2009-10-08 08:23:02 -07:00
Android (Google) Code Review
33b9fc3502 Merge change Ib7c34cec into eclair
* changes:
  dumpstate: 'RAMCONSOLE' -> 'LAST KMSG'
2009-10-08 11:11:50 -04:00
Bryan Mawhinney
73590f0e9e am f81ecc1f: Merge change I29232f2a into eclair
Merge commit 'f81ecc1fb7cad523b62c7f2662f4aab3ea0dee54' into eclair-plus-aosp

* commit 'f81ecc1fb7cad523b62c7f2662f4aab3ea0dee54':
  Only dismiss search dialog after launching intent.
2009-10-08 01:54:30 -07:00
Android (Google) Code Review
8147d73714 Merge change I29232f2a into eclair
* changes:
  Only dismiss search dialog after launching intent.
2009-10-08 04:49:23 -04:00
Fred Quintana
0a071f09b6 am 8bd04b20: Merge change Iea48361d into eclair
Merge commit '8bd04b2000f418c8c6f4f628abc215bb5a688244' into eclair-plus-aosp

* commit '8bd04b2000f418c8c6f4f628abc215bb5a688244':
  fix an NPE on a race condition that occurs when unbinding from an authenticator at the samer time that its process dies: bug 2171204
2009-10-08 00:55:03 -07:00
Android (Google) Code Review
b03ef1fbcb Merge change Iea48361d into eclair
* changes:
  fix an NPE on a race condition that occurs when unbinding from an authenticator at the samer time that its process dies: bug 2171204
2009-10-08 03:50:07 -04:00
Dianne Hackborn
aa90fe37ab am b134b203: Merge change Id8c9cb2f into eclair
Merge commit 'b134b2038ecabcbec3f9b657834d45de27707068' into eclair-plus-aosp

* commit 'b134b2038ecabcbec3f9b657834d45de27707068':
  More fix #2163209: alarm clock rings but is hidden behind lock screen
2009-10-07 22:08:15 -07:00
Android (Google) Code Review
bbc4b4e754 Merge change Id8c9cb2f into eclair
* changes:
  More fix #2163209: alarm clock rings but is hidden behind lock screen
2009-10-08 00:58:46 -04:00
Dave Sparks
b0c89aee97 am 281acf42: Merge change I52479480 into eclair
Merge commit '281acf421f4b977add75d736d1083413e1d5f24a' into eclair-plus-aosp

* commit '281acf421f4b977add75d736d1083413e1d5f24a':
  Retry overlay create if it fails. Bug 2153980.
2009-10-07 21:14:29 -07:00
Android (Google) Code Review
5ce17499c6 Merge change I52479480 into eclair
* changes:
  Retry overlay create if it fails. Bug 2153980.
2009-10-08 00:07:05 -04:00