10255 Commits

Author SHA1 Message Date
David 'Digit' Turner
4c220bd0f3 Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 2009-10-07 15:18:09 -07:00
Nick Pelly
825a3b20a7 am dc2ccb82: Merge change Ia4879943 into eclair
Merge commit 'dc2ccb82f96b6a7be7a7b262b81d3aa1422f46fa' into eclair-plus-aosp

* commit 'dc2ccb82f96b6a7be7a7b262b81d3aa1422f46fa':
  Encourage developers to connect RFCOMM by UUID instead of Channel.
2009-10-07 15:12:53 -07:00
Android (Google) Code Review
dc2ccb82f9 Merge change Ia4879943 into eclair
* changes:
  Encourage developers to connect RFCOMM by UUID instead of Channel.
2009-10-07 18:04:45 -04:00
Romain Guy
3504ec1083 am 1f42439a: am 35b38cef: Improve drawing cache speed by selecting the correct opacity and keeping a 32 bits format when the window is 32 bits.
Merge commit '1f42439ad675c4dc7bbd121b0d4b8ba30c6924b2' into eclair-mr2-plus-aosp

* commit '1f42439ad675c4dc7bbd121b0d4b8ba30c6924b2':
2009-10-07 14:38:12 -07:00
Romain Guy
ff9c48b304 Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 2009-10-07 14:38:12 -07:00
Romain Guy
1f42439ad6 am 35b38cef: Improve drawing cache speed by selecting the correct opacity and keeping a 32 bits format when the window is 32 bits.
Merge commit '35b38cefcc92f1ed599a652ac5736ab9e9e75039' into eclair-mr2

* commit '35b38cefcc92f1ed599a652ac5736ab9e9e75039':
  Improve drawing cache speed by selecting the correct opacity and keeping a 32 bits
2009-10-07 14:30:41 -07:00
Romain Guy
8084b6bc32 am 35b38cef: Improve drawing cache speed by selecting the correct opacity and keeping a 32 bits format when the window is 32 bits.
Merge commit '35b38cefcc92f1ed599a652ac5736ab9e9e75039' into eclair-plus-aosp

* commit '35b38cefcc92f1ed599a652ac5736ab9e9e75039':
  Improve drawing cache speed by selecting the correct opacity and keeping a 32 bits
2009-10-07 14:30:37 -07:00
Nick Pelly
16fb88a673 Encourage developers to connect RFCOMM by UUID instead of Channel.
Hide createRfcommSocket(int channel)
Add createRfcommSocketWithServiceRecord(UUID uuid)

Rename listenUsingRfcomm(String,UUID) -> listenUsingRfcommWithServiceRecord(..)

Now we have a complete API for developers to make peer-peer RFCOMM connections
with hard-coding the limited (30) RFCOMM channels, instead using SDP lookup
of an UUID.

This commit addresses two serious bugs:
- Do not throw IOException on accepting an incoming RFCOMM connection with
  BluetoothSocket. This was a regression from commit 24bb9b8af4ff6915
- Workaround failure of bluez to update SDP cache when channel changes by
  trying to use the same RFCOMM channel on the server every time, instead
  of picking server channels randomly. This is a pretty ugly workaround,
  and we are still trying to fix the caching issue - but with this
  workaround we are at least shippable and apps will work at least until
  they start colliding on the 30 RFCOMM channels.

DrNo: eastham
Bug: 2158900
Joke: What did the digital watch say to his mom? "Look mom no hands."
Change-Id: Ia4879943b83afac06b6f1a3f2391cf1628afce7d
2009-10-07 23:25:24 +02:00
Romain Guy
35b38cefcc Improve drawing cache speed by selecting the correct opacity and keeping a 32 bits
format when the window is 32 bits.

Change-Id: I46762def67fa7d6a331a75fa8660c6422394ccf2
2009-10-07 14:08:24 -07:00
Andreas Huber
1e988a04b5 am f894d111: Merge change I6c32aa75 into eclair-mr2
Merge commit 'f894d111c8c1ad9038c2d434e1cd78616a6bda0a' into eclair-mr2-plus-aosp

* commit 'f894d111c8c1ad9038c2d434e1cd78616a6bda0a':
  Workaround for avc decoder misreporting output buffer size requirements if the content is not a multiple-16 width/height.
2009-10-07 13:59:49 -07:00
Mike Reed
8e9d080e44 am 1665b48f: am 64dd5be5: Merge change Ia78b0a2d into eclair
Merge commit '1665b48f5e1faa920445bd7be8dc1cb2df481a70' into eclair-mr2-plus-aosp

* commit '1665b48f5e1faa920445bd7be8dc1cb2df481a70':
2009-10-07 13:59:44 -07:00
Jeff Hamilton
254d7ecd06 Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 2009-10-07 13:59:43 -07:00
Android (Google) Code Review
f894d111c8 Merge change I6c32aa75 into eclair-mr2
* changes:
  Workaround for avc decoder misreporting output buffer size requirements if the content is not a multiple-16 width/height.
2009-10-07 16:54:30 -04:00
Andreas Huber
8b432b1d85 Workaround for avc decoder misreporting output buffer size requirements if the content is not a multiple-16 width/height. 2009-10-07 13:53:24 -07:00
Mike Reed
1665b48f5e am 64dd5be5: Merge change Ia78b0a2d into eclair
Merge commit '64dd5be583bab8218e54068bbf70edc5fc6087c8' into eclair-mr2

* commit '64dd5be583bab8218e54068bbf70edc5fc6087c8':
  add (hidden) setHasAlpha() to allow clients like the view's cache to hint that a bitmap is opaque.
2009-10-07 12:33:47 -07:00
Mike Reed
9ea47b5aa3 am 64dd5be5: Merge change Ia78b0a2d into eclair
Merge commit '64dd5be583bab8218e54068bbf70edc5fc6087c8' into eclair-plus-aosp

* commit '64dd5be583bab8218e54068bbf70edc5fc6087c8':
  add (hidden) setHasAlpha() to allow clients like the view's cache to hint that a bitmap is opaque.
2009-10-07 12:32:10 -07:00
Android (Google) Code Review
64dd5be583 Merge change Ia78b0a2d into eclair
* changes:
  add (hidden) setHasAlpha() to allow clients like the view's cache to hint that a bitmap is opaque.
2009-10-07 15:22:50 -04:00
Amith Yamasani
360fde8eab am 446aeb1c: Merge change Ia98129b9 into eclair-mr2
Merge commit '446aeb1c3d2bb4df3ca73b0d88ef1a7ae0f93d53' into eclair-mr2-plus-aosp

* commit '446aeb1c3d2bb4df3ca73b0d88ef1a7ae0f93d53':
  Fix preference caching to increase recycling of preference views.
2009-10-07 12:09:08 -07:00
Elliott Hughes
4f0c414c09 Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 2009-10-07 12:09:06 -07:00
Eric Fischer
caf2da3bac am e4b6639d: Merge change I9db1edea into eclair
Merge commit 'e4b6639dbcfe9c5a429fb6f216790d69d1b3a6e8' into eclair-plus-aosp

* commit 'e4b6639dbcfe9c5a429fb6f216790d69d1b3a6e8':
  Import revised translations.   DO NOT MERGE
2009-10-07 12:08:26 -07:00
Dianne Hackborn
7a889217d7 am 0c3154d3: Fix issue #2163654: deadlock, runtime restart
Merge commit '0c3154d3fc54a1b3d8358a2932042cca729327b9' into eclair-plus-aosp

* commit '0c3154d3fc54a1b3d8358a2932042cca729327b9':
  Fix issue #2163654: deadlock, runtime restart
2009-10-07 12:08:20 -07:00
Bjorn Bringert
3d302c8673 am 4625758d: Merge change I2c5f1e76 into eclair
Merge commit '4625758d0b909ccfc9f40b707666b1b21e9e8ffd' into eclair-plus-aosp

* commit '4625758d0b909ccfc9f40b707666b1b21e9e8ffd':
  Fix back button handling in ACTV
2009-10-07 12:01:28 -07:00
Android (Google) Code Review
446aeb1c3d Merge change Ia98129b9 into eclair-mr2
* changes:
  Fix preference caching to increase recycling of preference views.
2009-10-07 15:01:25 -04:00
Fred Quintana
96de23a7d8 am f038004f: changes from Sync Manager API Review: bug 2164262
Merge commit 'f038004f4a5e4fab18df9c87573ba1e82790c30f' into eclair-plus-aosp

* commit 'f038004f4a5e4fab18df9c87573ba1e82790c30f':
  changes from Sync Manager API Review: bug 2164262
2009-10-07 12:01:18 -07:00
Mathias Agopian
8bb8f862a8 am 460b60c9: Revert "temporarily disable the use of glTexImage2D for sw buffers on sholes."
Merge commit '460b60c9b064ef02e9eaf56ecf2f266fd7c4089c' into eclair-plus-aosp

* commit '460b60c9b064ef02e9eaf56ecf2f266fd7c4089c':
  Revert "temporarily disable the use of glTexImage2D for sw buffers on sholes."
2009-10-07 12:00:49 -07:00
Brett Chabot
c417d3b1fd am 773fd131: Merge change I3429f77a into eclair
Merge commit '773fd13130948397cac5178e16d17975a06a738b' into eclair-plus-aosp

* commit '773fd13130948397cac5178e16d17975a06a738b':
  Suppress flaky test HeapTest#testOomeLarge.
2009-10-07 12:00:02 -07:00
Mathias Agopian
f7b504f6ab am 26fe45dc: Merge change I4961c959 into eclair
Merge commit '26fe45dcb3df12eda94d93f1473cd6a2f5f345c7' into eclair-plus-aosp

* commit '26fe45dcb3df12eda94d93f1473cd6a2f5f345c7':
  fix [2152536] ANR in browser
2009-10-07 11:59:52 -07:00
Eric Laurent
555e032b1a am 62443f5f: Fix issue 2139634: DTMF tones on Sholes popping, hissing (audio latency too high).
Merge commit '62443f5f4517ba17d911975e695f1ab75bfdbf77' into eclair-plus-aosp

* commit '62443f5f4517ba17d911975e695f1ab75bfdbf77':
  Fix issue 2139634: DTMF tones on Sholes popping, hissing (audio latency too high).
2009-10-07 11:59:45 -07:00
Romain Guy
7828a209af am c404ed2b: Fix failing unit test; the test was using a deprecated API making it fail on WVGA devices.
Merge commit 'c404ed2be5d29c8932a3d69b53fea4653c9b868b' into eclair-plus-aosp

* commit 'c404ed2be5d29c8932a3d69b53fea4653c9b868b':
  Fix failing unit test; the test was using a deprecated API making it fail on WVGA devices.
2009-10-07 11:59:39 -07:00
Mathias Agopian
c2e2e53d84 am c131c567: temporarily disable the use of glTexImage2D for sw buffers on sholes.
Merge commit 'c131c5671965b69b0dee3e4afa3b3dd5e3c0c405' into eclair-plus-aosp

* commit 'c131c5671965b69b0dee3e4afa3b3dd5e3c0c405':
  temporarily disable the use of glTexImage2D for sw buffers on sholes.
2009-10-07 11:59:33 -07:00
Mathias Agopian
89663e6f4d am 9d6a685b: Merge changes I430cf57b,I51f02f67,I464f13f3 into eclair
Merge commit '9d6a685ba939f413a8d3e1e97627593aa1cdf6cb' into eclair-plus-aosp

* commit '9d6a685ba939f413a8d3e1e97627593aa1cdf6cb':
  fix [2168528] enable glTexImage2D code path in SF for software-only buffers
  fix [2168531] have software-only gralloc buffer side-step the HAL
  fix [2167050] glTexImage2D code path buggy in SurfaceFlinger
2009-10-07 11:59:27 -07:00
Jason Sams
36802f819d am fe7c2a50: Merge change I996db8da into eclair
Merge commit 'fe7c2a50148ac9f0d6fbe0030fc53f457c10870a' into eclair-plus-aosp

* commit 'fe7c2a50148ac9f0d6fbe0030fc53f457c10870a':
  Fix tls crash on startup if more than one RS contexts are created in one process.
2009-10-07 11:59:20 -07:00
gwang@google.com
1509731864 am 521f4f3a: Merge change I3d6cf8aa into eclair
Merge commit '521f4f3af94e3a093a37af887d3e317a526b61a1' into eclair-plus-aosp

* commit '521f4f3af94e3a093a37af887d3e317a526b61a1':
  Fix for bug 2158794. Hide MediaPlayer.invoke() and MediaPlayer.newRequest(), and Fix bad links in ToneGenerator documentation.
2009-10-07 11:57:45 -07:00
Xavier Ducrohet
f73b83dd95 am 5f9d4bae: layout lib tests cleanup
Merge commit '5f9d4bae03b2dfa9c1e43a6e01cacaa5a5326690' into eclair-plus-aosp

* commit '5f9d4bae03b2dfa9c1e43a6e01cacaa5a5326690':
  layout lib tests cleanup
2009-10-07 11:57:39 -07:00
Xavier Ducrohet
d35a4df519 am 0a9d46b7: Add a test to make sure the replaced classes in layoutlib are correct.
Merge commit '0a9d46b7e741ccf7272bb69a4eef3c1f2adc91b7' into eclair-plus-aosp

* commit '0a9d46b7e741ccf7272bb69a4eef3c1f2adc91b7':
  Add a test to make sure the replaced classes in layoutlib are correct.
2009-10-07 11:57:32 -07:00
Robert Greenwalt
c0565fb88c am 92b5caa4: Merge change Id8df149c into eclair
Merge commit '92b5caa4e21d48db6efeddba532d1546c6e686b1' into eclair-plus-aosp

* commit '92b5caa4e21d48db6efeddba532d1546c6e686b1':
  Turn some logging back on in ConnectionManager
2009-10-07 11:57:26 -07:00
Jim Miller
59a8dd2dc2 am f65161f1: Merge change If933b13d into eclair
Merge commit 'f65161f159db3d140c62f56d43e732c332af7773' into eclair-plus-aosp

* commit 'f65161f159db3d140c62f56d43e732c332af7773':
  Fix for 2161835: Tweaks to rotary lock screen:
2009-10-07 11:56:52 -07:00
Jason Sams
90a3ac73c9 am 968a9571: Merge change I516c3191 into eclair
Merge commit '968a9571a391a2dbb0512c4fb99d04ab50861753' into eclair-plus-aosp

* commit '968a9571a391a2dbb0512c4fb99d04ab50861753':
  Implement data push from scripts.  Fixes the problem where apps would have to poll to monitor a scripts state.
2009-10-07 11:56:45 -07:00
Wu-cheng Li
1dc8267389 am 962f2536: Merge change I547cff66 into eclair
Merge commit '962f253665e0c5cc8a29de9e59ce3992dad02440' into eclair-plus-aosp

* commit '962f253665e0c5cc8a29de9e59ce3992dad02440':
  Add zoom functions and sendCommand.
2009-10-07 11:56:00 -07:00
Fred Quintana
dac0f7d1cd am f83d9b3f: fix build breakage
Merge commit 'f83d9b3fcd74f2528b0acc74185d2d7bdd716942' into eclair-plus-aosp

* commit 'f83d9b3fcd74f2528b0acc74185d2d7bdd716942':
  fix build breakage
2009-10-07 11:55:53 -07:00
Fred Quintana
6c0af3b245 am 5bba632d: - hide Entity and all its references - remove updateEntity and insertEntity, since they are not used - add the RawContacts.Entity class, which is used in lieu of the android.content.Entity
Merge commit '5bba632d877c2878384ff21566c8eb6a1a22f37b' into eclair-plus-aosp

* commit '5bba632d877c2878384ff21566c8eb6a1a22f37b':
  - hide Entity and all its references
2009-10-07 11:55:10 -07:00
Suchi Amalapurapu
1d16200eef am 5163cd6d: Merge change I5be3d603 into eclair
Merge commit '5163cd6d1cb664977eb4473b98657c7e92ae430e' into eclair-plus-aosp

* commit '5163cd6d1cb664977eb4473b98657c7e92ae430e':
  Make sdk version and code names static finals in PackageParser.
2009-10-07 11:54:44 -07:00
Daisuke Miyakawa
b7ea469968 am ccc214b2: Merge change I6a0b14bd into eclair
Merge commit 'ccc214b21edaaddf46960388ec4d3e3ca89a01ae' into eclair-plus-aosp

* commit 'ccc214b21edaaddf46960388ec4d3e3ca89a01ae':
  Make VCardComposer create the instance for mHandlerList.
2009-10-07 11:53:53 -07:00
Evan Millar
3e82418127 am 9c3c276a: Merge change I8333dcc4 into eclair
Merge commit '9c3c276afa7e2485e1a9f47e29ada8cb61b7b07c' into eclair-plus-aosp

* commit '9c3c276afa7e2485e1a9f47e29ada8cb61b7b07c':
  New section header and divider assets.
2009-10-07 11:53:32 -07:00
Bjorn Bringert
a47607917e am 030b2cf1: Merge change I76d7ba61 into eclair
Merge commit '030b2cf1eaab25890aa97e7e2a660ff5998e8639' into eclair-plus-aosp

* commit '030b2cf1eaab25890aa97e7e2a660ff5998e8639':
  Pixel tweak search dialog to match search widget
2009-10-07 11:52:57 -07:00
Xavier Ducrohet
7c28655d08 am 841a8eea: Merge change I24895c35 into eclair
Merge commit '841a8eea78479ad8a3c10e69a788adbeaef5a53d' into eclair-plus-aosp

* commit '841a8eea78479ad8a3c10e69a788adbeaef5a53d':
  Reimplement all the method of Paint for layoutlib
2009-10-07 11:52:46 -07:00
Eric Fischer
6a230c105a am 6756e440: am e4b6639d: (-s ours) Merge change I9db1edea into eclair
Merge commit '6756e440c3b526e5bb97f42ab4b84aa2b595a3b7' into eclair-mr2-plus-aosp

* commit '6756e440c3b526e5bb97f42ab4b84aa2b595a3b7':
  Import revised translations.   DO NOT MERGE
2009-10-07 11:52:45 -07:00
Marco Nelissen
38729e69ad am c39d2e3c: Music visualizer support hack. This currently assumes 44k stereo (won\'t crash on other formats, but won\'t give the correct results either), and links statically with libspeex to get FFT data, increasing the size of libmedia by about 45kb.
Merge commit 'c39d2e3c012fb96999991e30659a474f9f30f789' into eclair-plus-aosp

* commit 'c39d2e3c012fb96999991e30659a474f9f30f789':
  Music visualizer support hack.
2009-10-07 11:52:39 -07:00
Dianne Hackborn
c4f52bd755 am 7e5c5d97: am 0c3154d3: Fix issue #2163654: deadlock, runtime restart
Merge commit '7e5c5d975297ef76ae6640e06505a19fa8c0270e' into eclair-mr2-plus-aosp

* commit '7e5c5d975297ef76ae6640e06505a19fa8c0270e':
  Fix issue #2163654: deadlock, runtime restart
2009-10-07 11:52:39 -07:00
Robert Greenwalt
91f360869e am c24c0e9b: Merge change Ib8f16340 into eclair-mr2
Merge commit 'c24c0e9b5f81541af5d3094774eeebb4216655c5' into eclair-mr2-plus-aosp

* commit 'c24c0e9b5f81541af5d3094774eeebb4216655c5':
  Fix ConnectivityManager permissions check.
2009-10-07 11:52:32 -07:00