Commit Graph

20192 Commits

Author SHA1 Message Date
Adam Powell
c70fec6030 am 7d04f2bc: am 4c72ad75: Merge "Fix bug 2918587 Infinite loop and memory leak in AdapterView" into gingerbread
Merge commit '7d04f2bc4e38d5d7d2b37d6dec76fb3793311341'

* commit '7d04f2bc4e38d5d7d2b37d6dec76fb3793311341':
  Fix bug 2918587 Infinite loop and memory leak in AdapterView
2010-08-30 18:38:14 -07:00
Adam Powell
359edda83f am 4c72ad75: Merge "Fix bug 2918587 Infinite loop and memory leak in AdapterView" into gingerbread
Merge commit '4c72ad75cfb413f54cb59d413a232e77c7260ef2' into gingerbread-plus-aosp

* commit '4c72ad75cfb413f54cb59d413a232e77c7260ef2':
  Fix bug 2918587 Infinite loop and memory leak in AdapterView
2010-08-30 18:35:58 -07:00
Adam Powell
28afafdfd3 Merge "Fix bug 2918587 Infinite loop and memory leak in AdapterView" into gingerbread 2010-08-30 18:33:20 -07:00
Jeff Brown
d363aa2e41 am 36f0cb26: am 8d60866e: Input device calibration and capabilities.
Merge commit '36f0cb26cbb4ef62995ff2e5a540cf8814e7f030'

* commit '36f0cb26cbb4ef62995ff2e5a540cf8814e7f030':
  Input device calibration and capabilities.
2010-08-30 18:29:12 -07:00
Brad Fitzpatrick
160ccc36b2 am 734d2707: am bb660d7e: Merge "Renaming SharedPreferences.startCommit to apply" into gingerbread
Merge commit '734d270769c609c7d3a1f2ec46e1d329d9682ab4'

* commit '734d270769c609c7d3a1f2ec46e1d329d9682ab4':
  Renaming SharedPreferences$Editor.startCommit to apply
2010-08-30 18:25:02 -07:00
Jeff Brown
e0b0e8978f am 8d60866e: Input device calibration and capabilities.
Merge commit '8d60866e2100db70ecf0502c14768a384514d7e9' into gingerbread-plus-aosp

* commit '8d60866e2100db70ecf0502c14768a384514d7e9':
  Input device calibration and capabilities.
2010-08-30 18:22:32 -07:00
Brad Fitzpatrick
31a40d0f6c am bb660d7e: Merge "Renaming SharedPreferences.startCommit to apply" into gingerbread
Merge commit 'bb660d7e1bed3a07a1804bd9641d9634bfaa4972' into gingerbread-plus-aosp

* commit 'bb660d7e1bed3a07a1804bd9641d9634bfaa4972':
  Renaming SharedPreferences$Editor.startCommit to apply
2010-08-30 18:18:54 -07:00
Jeff Brown
38a7fabd96 Input device calibration and capabilities.
Finished the input device capability API.
Added a mechanism for calibrating touch devices to obtain more
accurate information about the touch contact area.
Improved pointer location to show new coordinates and capabilities.
Optimized pointer location display and formatting to avoid allocating large
numbers of temporary objects.  The GC churn was causing the application to
stutter very badly when more than a couple of fingers were down).
Added more diagnostics.

Change-Id: Ie25380278ed6f16c5b04cd9df848015850383498
2010-08-30 18:16:43 -07:00
Brad Fitzpatrick
296e9b712b Merge "Renaming SharedPreferences$Editor.startCommit to apply" into gingerbread 2010-08-30 18:14:44 -07:00
Jim Miller
a8b6129f0c Merge "Fix 2797185: Add recents to statusbar on xlarge device." 2010-08-30 18:04:30 -07:00
Dmitri Plotnikov
1bd7df2aaa Merge "Added new method to format the phone number when neccessary." 2010-08-30 17:48:05 -07:00
Daniel Sandler
761abca447 Merge "Turn off spammy RSSI logs." 2010-08-30 17:47:56 -07:00
Andreas Huber
d08d997337 am 03e83d4a: am 68ae91cb: Merge "Recent changes to the rtsp code require every buffer fed to the packet source to have a timestamp, we\'re ignoring timestamps for gtalk videochat but we still have to have a placeholder." into gingerbread
Merge commit '03e83d4ad909f5c07fb2011e03348a413453e909'

* commit '03e83d4ad909f5c07fb2011e03348a413453e909':
  Recent changes to the rtsp code require every buffer fed to the packet source to have a timestamp, we're ignoring timestamps for gtalk videochat but we still have to have a placeholder.
2010-08-30 16:19:55 -07:00
Andreas Huber
52b235b152 am 68ae91cb: Merge "Recent changes to the rtsp code require every buffer fed to the packet source to have a timestamp, we\'re ignoring timestamps for gtalk videochat but we still have to have a placeholder." into gingerbread
Merge commit '68ae91cbd20939e48ad15c15405048e7ff9fe2f8' into gingerbread-plus-aosp

* commit '68ae91cbd20939e48ad15c15405048e7ff9fe2f8':
  Recent changes to the rtsp code require every buffer fed to the packet source to have a timestamp, we're ignoring timestamps for gtalk videochat but we still have to have a placeholder.
2010-08-30 16:16:03 -07:00
Andreas Huber
627020958b Merge "Recent changes to the rtsp code require every buffer fed to the packet source to have a timestamp, we're ignoring timestamps for gtalk videochat but we still have to have a placeholder." into gingerbread 2010-08-30 16:12:46 -07:00
Andreas Huber
c2f33965d5 am 987556bc: am abb8398e: Merge "Instead of closing the connection altogether if no UDP packets arrive after a certain time, try changing transports (to interleaved TCP). Also properly close the sockets on disconnection." into gingerbread
Merge commit '987556bc9bc1a61415b6e65bd600b8daf5b24d30'

* commit '987556bc9bc1a61415b6e65bd600b8daf5b24d30':
  Instead of closing the connection altogether if no UDP packets arrive after a certain time, try changing transports (to interleaved TCP). Also properly close the sockets on disconnection.
2010-08-30 16:02:26 -07:00
Andreas Huber
a53289ba6b am abb8398e: Merge "Instead of closing the connection altogether if no UDP packets arrive after a certain time, try changing transports (to interleaved TCP). Also properly close the sockets on disconnection." into gingerbread
Merge commit 'abb8398e5ab40a3078902c5333126a0743ba2458' into gingerbread-plus-aosp

* commit 'abb8398e5ab40a3078902c5333126a0743ba2458':
  Instead of closing the connection altogether if no UDP packets arrive after a certain time, try changing transports (to interleaved TCP). Also properly close the sockets on disconnection.
2010-08-30 15:46:58 -07:00
Andreas Huber
d8864f83bb Merge "Instead of closing the connection altogether if no UDP packets arrive after a certain time, try changing transports (to interleaved TCP). Also properly close the sockets on disconnection." into gingerbread 2010-08-30 15:43:41 -07:00
Mattias Falk
7d27953727 am 4076d4f8: am 12dbee82: Avoid NullPointerException in BrowserFrame
Merge commit '4076d4f887097f3e6d2f1f3863172507629db0b9'

* commit '4076d4f887097f3e6d2f1f3863172507629db0b9':
  Avoid NullPointerException in BrowserFrame
2010-08-30 15:27:16 -07:00
Jean-Baptiste Queru
c390b553d6 am 86aeac98: am 1d22e122: Merge "Fix a monkey crash when the new WebView is destroyed."
Merge commit '86aeac9844f1cb4d07c53c581bca4d9b8377b354'

* commit '86aeac9844f1cb4d07c53c581bca4d9b8377b354':
  Fix a monkey crash when the new WebView is destroyed.
2010-08-30 15:27:10 -07:00
Kenny Root
af5b027c1d am 8a5ab396: am 2e86809b: Merge "Native libraries on SD" into gingerbread
Merge commit '8a5ab396cf4f3bb76a3e820f16f946e313b73fcf'

* commit '8a5ab396cf4f3bb76a3e820f16f946e313b73fcf':
  Native libraries on SD
2010-08-30 15:24:45 -07:00
Mattias Falk
048285c479 am 12dbee82: Avoid NullPointerException in BrowserFrame
Merge commit '12dbee827353ecdb690d27c3f52e26afc71e0774' into gingerbread-plus-aosp

* commit '12dbee827353ecdb690d27c3f52e26afc71e0774':
  Avoid NullPointerException in BrowserFrame
2010-08-30 15:21:55 -07:00
Jean-Baptiste Queru
edd2f65e33 am 1d22e122: Merge "Fix a monkey crash when the new WebView is destroyed."
Merge commit '1d22e122a6f278a432519673a8ad3e4853934461' into gingerbread-plus-aosp

* commit '1d22e122a6f278a432519673a8ad3e4853934461':
  Fix a monkey crash when the new WebView is destroyed.
2010-08-30 15:21:51 -07:00
Kenny Root
daeb9eb67c am 2e86809b: Merge "Native libraries on SD" into gingerbread
Merge commit '2e86809b6c79375d23c0975914efc3b66e89ac90' into gingerbread-plus-aosp

* commit '2e86809b6c79375d23c0975914efc3b66e89ac90':
  Native libraries on SD
2010-08-30 15:21:17 -07:00
Kenny Root
9a2a7a3f9a Merge "Native libraries on SD" into gingerbread 2010-08-30 15:16:10 -07:00
Eric Laurent
714cc7e416 am 44217848: am ae6bdc23: Merge "Fix issue 2952766." into gingerbread
Merge commit '4421784895a58bb7bcf90236a9e443b372b5b80e'

* commit '4421784895a58bb7bcf90236a9e443b372b5b80e':
  Fix issue 2952766.
2010-08-30 15:07:45 -07:00
Eric Laurent
fbb5526f5c am ae6bdc23: Merge "Fix issue 2952766." into gingerbread
Merge commit 'ae6bdc23bd3fc74416985b93c995c54ea588d349' into gingerbread-plus-aosp

* commit 'ae6bdc23bd3fc74416985b93c995c54ea588d349':
  Fix issue 2952766.
2010-08-30 15:04:48 -07:00
Jean-Baptiste Queru
e1afd1f1c4 Merge "Fix a monkey crash when the new WebView is destroyed." 2010-08-30 15:03:06 -07:00
Eric Laurent
44de521321 Merge "Fix issue 2952766." into gingerbread 2010-08-30 15:02:06 -07:00
Gloria Wang
9f01c66f06 Merge "Fix for "@param tag with name that doesn't match the parameter list: 'fileStream'"" 2010-08-30 14:43:11 -07:00
Eric Fischer
a7d2f3594b Merge "Import revised translations" 2010-08-30 14:20:05 -07:00
Wu-cheng Li
e3beff9332 am 6e46e6f7: am 7ec7b997: Remove camera metering mode API.
Merge commit '6e46e6f7488ad1f4e6ab762d141790798fe3f2d5'

* commit '6e46e6f7488ad1f4e6ab762d141790798fe3f2d5':
  Remove camera metering mode API.
2010-08-30 14:06:16 -07:00
Jean-Baptiste Queru
62cd9aa77c resolved conflicts for merge of ff749b9a to master
Change-Id: Ieb368754b84a47179b75cbae8fcd7d971893b7af
2010-08-30 14:00:27 -07:00
Wu-cheng Li
01a43af593 am 7ec7b997: Remove camera metering mode API.
Merge commit '7ec7b9970cc3a6311bf043e228991adf24c43523' into gingerbread-plus-aosp

* commit '7ec7b9970cc3a6311bf043e228991adf24c43523':
  Remove camera metering mode API.
2010-08-30 13:48:07 -07:00
Jean-Baptiste Queru
9ccfef93d7 am 9773cd73: (-s ours) am f470ed86: Merge "Support surrogate pairs when layouting text"
Merge commit '9773cd73b627c8521257c005881554d183d19a63'

* commit '9773cd73b627c8521257c005881554d183d19a63':
  Support surrogate pairs when layouting text
2010-08-30 13:47:37 -07:00
Joe Onorato
02a13a9f66 Merge "Add another pass of the docs that nothing depends on that tries to parse some of the docs but without generating all of them." 2010-08-30 13:34:55 -07:00
Andreas Huber
60bfaffe15 am 9aa05ec2: am 681c5ff2: Merge "Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore." into gingerbread
Merge commit '9aa05ec2cd6bc592074c7bd08d22db46649c7f12'

* commit '9aa05ec2cd6bc592074c7bd08d22db46649c7f12':
  Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore.
2010-08-30 13:30:35 -07:00
Eric Laurent
59f6934957 am 5762dc19: am 858bb4f6: Merge "LVM release 1.07 delivery." into gingerbread
Merge commit '5762dc19836e332d3ac1906e5698088a128b362d'

* commit '5762dc19836e332d3ac1906e5698088a128b362d':
  LVM release 1.07 delivery.
2010-08-30 13:30:14 -07:00
Eric Rowe
a40376226b am 6151a9ef: (-s ours) am f72b0e44: Merge "DO NOT MERGE Add A2DP and Headset connection stress tests." into gingerbread
Merge commit '6151a9ef232b9d4d2b38761159f49181679a6a17'

* commit '6151a9ef232b9d4d2b38761159f49181679a6a17':
  DO NOT MERGE Add A2DP and Headset connection stress tests.
2010-08-30 13:30:10 -07:00
Andreas Huber
fa639bc0d4 am 7ed9104c: am f6639c46: Finetune some rtsp timeout constants.
Merge commit '7ed9104c3acb172a480ebd7fd456fe69efd1ec3d'

* commit '7ed9104c3acb172a480ebd7fd456fe69efd1ec3d':
  Finetune some rtsp timeout constants.
2010-08-30 13:30:05 -07:00
Eric Fischer
1cb736c5e5 am a7dae24c: (-s ours) am 01ee34d7: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit 'a7dae24ccde658d8da00e9b738ba334704dca1e8'

* commit 'a7dae24ccde658d8da00e9b738ba334704dca1e8':
  Import revised translations.  DO NOT MERGE
2010-08-30 13:29:57 -07:00
Andreas Huber
86c75a5c23 am 6df6d606: am df992ac9: Merge "ALoopers can now be named (useful to distinguish threads)." into gingerbread
Merge commit '6df6d60681be9d524ce7fc07f2511008de424d27'

* commit '6df6d60681be9d524ce7fc07f2511008de424d27':
  ALoopers can now be named (useful to distinguish threads).
2010-08-30 13:29:51 -07:00
Imre Sunyi
5e1bb4abfd am 1429f465: am fd04143a: Shutdown when capacity is 0% and no charging or when battery is dead
Merge commit '1429f465f42bb9e3ef3ecfd1ee9af214901fc999'

* commit '1429f465f42bb9e3ef3ecfd1ee9af214901fc999':
  Shutdown when capacity is 0% and no charging or when battery is dead
2010-08-30 13:28:16 -07:00
Jean-Baptiste Queru
8cdd4c6fcc am 55a2df8c: Merge "Telephony: Control operator selection using EF_CSP data."
Merge commit '55a2df8c773f2b0af02d0a47fa5be4f14fcbf419' into gingerbread-plus-aosp

* commit '55a2df8c773f2b0af02d0a47fa5be4f14fcbf419':
  Telephony: Control operator selection using EF_CSP data.
2010-08-30 13:20:57 -07:00
Jean-Baptiste Queru
cceddb5964 am f470ed86: Merge "Support surrogate pairs when layouting text"
Merge commit 'f470ed8630e9e648727443b065b9f1c69fee34d6' into gingerbread-plus-aosp

* commit 'f470ed8630e9e648727443b065b9f1c69fee34d6':
  Support surrogate pairs when layouting text
2010-08-30 13:20:41 -07:00
Andreas Huber
1a99837a81 am 681c5ff2: Merge "Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore." into gingerbread
Merge commit '681c5ff2085a08835c08b97641ebdc1b37489943' into gingerbread-plus-aosp

* commit '681c5ff2085a08835c08b97641ebdc1b37489943':
  Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore.
2010-08-30 13:06:55 -07:00
Andreas Huber
ad40891c43 Merge "Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore." into gingerbread 2010-08-30 13:04:21 -07:00
Jean-Baptiste Queru
7cdfe1e440 Merge "Telephony: Control operator selection using EF_CSP data." 2010-08-30 13:00:48 -07:00
Eric Laurent
44e1255529 am 858bb4f6: Merge "LVM release 1.07 delivery." into gingerbread
Merge commit '858bb4f66ea1bd9c48b9817cb44a59c8b0394229' into gingerbread-plus-aosp

* commit '858bb4f66ea1bd9c48b9817cb44a59c8b0394229':
  LVM release 1.07 delivery.
2010-08-30 12:33:56 -07:00
Eric Rowe
9f48359b26 am f72b0e44: Merge "DO NOT MERGE Add A2DP and Headset connection stress tests." into gingerbread
Merge commit 'f72b0e447296bc07104af62c33c56bc15b7a6677' into gingerbread-plus-aosp

* commit 'f72b0e447296bc07104af62c33c56bc15b7a6677':
  DO NOT MERGE Add A2DP and Headset connection stress tests.
2010-08-30 12:33:52 -07:00