Commit Graph

5078 Commits

Author SHA1 Message Date
Android (Google) Code Review
3aaa924bb8 Merge change Ifd71653f into eclair-mr2
* changes:
  add local flag to enable FPS w/o having to enable Config.DEBUG, which can have unintended costs
2009-10-12 14:52:45 -04:00
Mike Lockwood
6d66522ea9 am 6abf7c8f: Merge change Iad66a274 into eclair
Merge commit '6abf7c8fccf1430bf5d730592b79d77fbeccfe5b' into eclair-mr2

* commit '6abf7c8fccf1430bf5d730592b79d77fbeccfe5b':
  Fix race condition in WindowManagerService.disableKeyguard()
2009-10-12 11:21:28 -07:00
Android (Google) Code Review
beb1f98afb Merge change Iad66a274 into eclair
* changes:
  Fix race condition in WindowManagerService.disableKeyguard()
2009-10-12 14:14:44 -04:00
Nick Pelly
30d15f3e6d am d301c904: Merge change I305c181c into eclair
Merge commit 'd301c90446644f63cda9b9263f83332676065bb4' into eclair-mr2

* commit 'd301c90446644f63cda9b9263f83332676065bb4':
  Delay 500ms between each registering each SDP record using sdptool.
2009-10-12 11:11:38 -07:00
Dianne Hackborn
6342c58598 am f836acf2: Merge change I067d55ea into eclair
Merge commit 'f836acf241f10d943d72d439fa425fda73a6d56b' into eclair-mr2

* commit 'f836acf241f10d943d72d439fa425fda73a6d56b':
  Fix issue #2179931: Power key to wake up frequently ignored when in dock app
2009-10-12 11:11:30 -07:00
Android (Google) Code Review
b511d372c6 Merge change I305c181c into eclair
* changes:
  Delay 500ms between each registering each SDP record using sdptool.
2009-10-12 14:05:44 -04:00
Android (Google) Code Review
71df04a877 Merge change I067d55ea into eclair
* changes:
  Fix issue #2179931: Power key to wake up frequently ignored when in dock app
2009-10-12 14:04:31 -04:00
Android (Google) Code Review
faf907984d Merge change I4a4323c0 into eclair-mr2
* changes:
  Fixes scroll/measure bug in EditText
2009-10-12 13:31:19 -04:00
Android (Google) Code Review
6f31c11692 Merge change I409d9b4a into eclair-mr2
* changes:
  Wifi: Fix runtime crash in when scan results contain KSC 5601 SSID
2009-10-10 16:28:58 -04:00
Jeff Hamilton
49c9a09c94 am 6dc3f4e5: Now that Eclair has been defined as API revision 5 mark Build.VERSION_CODES.ECLAIR as such.
Merge commit '6dc3f4e553d333b9f115a222a9a684bb2aa55b5e' into eclair-mr2

* commit '6dc3f4e553d333b9f115a222a9a684bb2aa55b5e':
  Now that Eclair has been defined as API revision 5 mark Build.VERSION_CODES.ECLAIR as such.
2009-10-10 11:25:39 -07:00
Fred Quintana
57f753e79b am 083a50a3: Merge change I66693ea2 into eclair
Merge commit '083a50a394915b562ad53be9fd8ec7524e3db21c' into eclair-mr2

* commit '083a50a394915b562ad53be9fd8ec7524e3db21c':
  fix sync exponential backoff for expedited syncs
2009-10-09 21:15:55 -07:00
Android (Google) Code Review
3b3b62cba2 Merge change I66693ea2 into eclair
* changes:
  fix sync exponential backoff for expedited syncs
2009-10-10 00:10:29 -04:00
Android (Google) Code Review
59e2184836 Merge change I85f598e0 into eclair-mr2
* changes:
  Prevent transparent region from getting out of sync with Surface Flinger
2009-10-09 20:40:26 -04:00
Dianne Hackborn
b15cf5c7f6 am ee110be0: Fix issue #2179891: Need to update 5.xml
Merge commit 'ee110be02256b816ac6d863e39cb8b11b8071baa' into eclair-mr2

* commit 'ee110be02256b816ac6d863e39cb8b11b8071baa':
  Fix issue #2179891: Need to update 5.xml
2009-10-09 17:38:59 -07:00
Romain Guy
c997b904c0 am 8eb955b9: Merge change I5e482bbc into eclair
Merge commit '8eb955b934c49ce814bce1a84bc995eef849051d' into eclair-mr2

* commit '8eb955b934c49ce814bce1a84bc995eef849051d':
  Add new RenderScript sample: ImageProcessing.
2009-10-09 16:27:35 -07:00
Eric Fischer
bd574f3eca am c08efb27: (-s ours) Import revised translations. DO NOT MERGE
Merge commit 'c08efb2712fbcc25ce9c208f3c9d7c0935e209d4' into eclair-mr2

* commit 'c08efb2712fbcc25ce9c208f3c9d7c0935e209d4':
  Import revised translations.  DO NOT MERGE
2009-10-09 16:27:19 -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
Android (Google) Code Review
5e0f98e54e Merge change I6ce46417 into eclair-mr2
* changes:
  Clean-up vCard code.
2009-10-09 16:31:33 -04:00
Android (Google) Code Review
2360f98285 Merge change I1fb066b0 into eclair-mr2
* changes:
  Rename VCardTest.java to VCardImportTest.java.
2009-10-09 12:45:39 -04:00
Android (Google) Code Review
4b3b107471 Merge change Ib01005ea into eclair-mr2
* changes:
  Avoid extracting EXIF data for non-JPEG images.
2009-10-09 12:21:37 -04:00
Android (Google) Code Review
970bc1b5e7 Merge change Ib64cab41 into eclair-mr2
* changes:
  Split the ColorConverter off SoftwareRenderer, metadata support in stagefright.
2009-10-09 11:44:25 -04:00
Robert Greenwalt
59236ebbde am 98e0b146: Make PhoneStateListeners not call TelephonyManager
Merge commit '98e0b146b80670b52805b4b210ef5582dad6bb68' into eclair-mr2

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

* commit '1184313cbea3b34a4596a90be7081551d36f251a':
  Setting WebCore cache limit depending on the memory class.
2009-10-09 00:10:58 -07:00
Dan Egnor
72e1a36531 am 6903d5ce: Merge change Iee649a81 into eclair
Merge commit '6903d5cedcffa005818c497f672cf16c2dff619c' into eclair-mr2

* commit '6903d5cedcffa005818c497f672cf16c2dff619c':
  Add LAST_KMSG_KB variable, used to tune the size of /proc/last_kmsg uploads.
2009-10-08 20:24:20 -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
Daisuke Miyakawa
d49c701904 Merge commit 'refs/changes/08/29008/8' of ssh://dmiyakawa@android-git.corp.google.com:29418/platform/frameworks/base into cleanup_import
Conflicts:

	core/java/android/pim/vcard/ContactStruct.java
2009-10-08 19:57:36 -07:00
Jim Miller
989fafc6ad am ad60e7fe: Merge change I9485aec1 into eclair
Merge commit 'ad60e7fe2c9588cd16c1351419af90964beb232d' into eclair-mr2

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

* commit '2c6c5e6e49795e6e24cd089c9018377d837ba931':
  Fix issue #2176944: Need API so browser, others can determine memory size of device
2009-10-08 19:09:17 -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
15677f3c47 am d10d02f5: Merge change I490e01ba into eclair
Merge commit 'd10d02f53ec00bfa9eb9f5accf6454e4a4bbb6a6' into eclair-mr2

* commit 'd10d02f53ec00bfa9eb9f5accf6454e4a4bbb6a6':
  Fix issue #2174566: HOT STABILITY: NPE in activity manager
2009-10-08 18:44:37 -07:00
Dianne Hackborn
f917969f79 am 89becd79: Fix issue #2177262: Improve animations
Merge commit '89becd79da643421adc2dbb0cdccc547a0611abb' into eclair-mr2

* commit '89becd79da643421adc2dbb0cdccc547a0611abb':
  Fix issue #2177262: Improve animations
2009-10-08 18:44:25 -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
7f0987385e am 9e2562b8: Merge change I88c6e267 into eclair
Merge commit '9e2562b8f97fec7e13e6302678459e99b8cccb2a' into eclair-mr2

* commit '9e2562b8f97fec7e13e6302678459e99b8cccb2a':
  Fix issue #2175693: Add vmallocinfo to dumpstate
2009-10-08 17:36:39 -07:00
Nick Pelly
705a744358 am db7ae10d: (-s ours) Remove STOPSHIP BT logging.
Merge commit 'db7ae10d6b8e86ff5311512de45afa65a1b0a738' into eclair-mr2

* commit 'db7ae10d6b8e86ff5311512de45afa65a1b0a738':
  Remove STOPSHIP BT logging.
2009-10-08 17:36:25 -07:00
Nick Pelly
82faf5fc11 am e6ee3be1: BT API security audit: fix a couple of permission mistakes.
Merge commit 'e6ee3be1c254404dad842298f6f56c11cc6c7ac8' into eclair-mr2

* commit 'e6ee3be1c254404dad842298f6f56c11cc6c7ac8':
  BT API security audit: fix a couple of permission mistakes.
2009-10-08 17:36:19 -07:00
Mathias Agopian
25194ea410 am 846322a9: Merge change Ib96df854 into eclair
Merge commit '846322a9ae5ef8155cca0059d3f64d718516ca13' into eclair-mr2

* commit '846322a9ae5ef8155cca0059d3f64d718516ca13':
  add a way to easily catch and log GL errors (compile time flag)
2009-10-08 17:36:06 -07:00
Eric Fischer
e56808396f am aaa6299b: (-s ours) am 24c8645a: (-s ours) Import revised translations. DO NOT MERGE
Merge commit 'aaa6299bcd1a44f5f066ef48fb99cc0a704cbd0f' into eclair-mr2

* commit 'aaa6299bcd1a44f5f066ef48fb99cc0a704cbd0f':
  Import revised translations.  DO NOT MERGE
2009-10-08 17:32:43 -07:00
Jean-Baptiste Queru
87f59358b6 am ea110274: (-s ours) am ac62c84a: (-s ours) DO NOT MERGE merge from donut-gms
Merge commit 'ea11027401a6b0e8fc351b7585d929e8fdb3fd08' into eclair-mr2

* commit 'ea11027401a6b0e8fc351b7585d929e8fdb3fd08':
  Import revised translations.  DO NOT MERGE
2009-10-08 17:32:37 -07:00
Mike Lockwood
27230e0354 am 348b92bd: Merge change Iee227ace into eclair
Merge commit '348b92bd513087369ac682e29620d7829fa1381b' into eclair-mr2

* commit '348b92bd513087369ac682e29620d7829fa1381b':
  GPS: Fix problem with SUPL when SUPL APN is already active.
2009-10-08 17:32:31 -07:00
Eric Laurent
601f4ce18b am ff94720b: Merge change I80a6a229 into eclair
Merge commit 'ff94720b8bf9f83f326197cb0cb27576168e9448' into eclair-mr2

* 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 17:31:22 -07:00
Jaikumar Ganesh
bb78f3ec89 am 9d5b5899: Merge change Ie5d93b7e into eclair
Merge commit '9d5b58991ef90e91b3c942c80ae3502ed62d10aa' into eclair-mr2

* commit '9d5b58991ef90e91b3c942c80ae3502ed62d10aa':
  Set the Bond State to NONE when we receive a Agent Cancel.
2009-10-08 17:30:34 -07:00
John Wang
1a9ca889aa am 33e21fcc: Control H icon display in Status bar.
Merge commit '33e21fcc99dd91061ea245984c4e9a1544cb943f' into eclair-mr2

* commit '33e21fcc99dd91061ea245984c4e9a1544cb943f':
  Control H icon display in Status bar.
2009-10-08 17:30:12 -07:00
Romain Guy
9ecb532726 am 3b36ed09: Merge change I95319bde into eclair
Merge commit '3b36ed09293965e7e5dc20dfa514422388e796d6' into eclair-mr2

* commit '3b36ed09293965e7e5dc20dfa514422388e796d6':
  Fixes #2175599. Prevents an NPE when AttachInfo is null.
2009-10-08 17:29:39 -07:00
Daisuke Miyakawa
63801179e4 am 387e73bd: Merge change Ib977f2bd into eclair
Merge commit '387e73bd8fbecae0b95e3005ca8187ddbda1aff7' into eclair-mr2

* commit '387e73bd8fbecae0b95e3005ca8187ddbda1aff7':
  Make vCard import Photo from vCard file :(
2009-10-08 17:29:32 -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
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
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