Commit Graph

5159 Commits

Author SHA1 Message Date
Mathias Agopian
cfc7010ef8 temporarily disable the use of glTexImage2D for sw buffers on sholes.
we're going to first cut a build without this change.

Approved by Dr. Hiroshi.
2009-10-06 17:59:43 -07:00
Android (Google) Code Review
ef8646344a Merge changes I430cf57b,I51f02f67,I464f13f3 into eclair
* changes:
  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-06 20:46:37 -04:00
Mathias Agopian
a4b740ed89 fix [2168528] enable glTexImage2D code path in SF for software-only buffers 2009-10-06 17:24:26 -07:00
Android (Google) Code Review
255f3917c6 Merge change I996db8da into eclair
* changes:
  Fix tls crash on startup if more than one RS contexts are created in one process.
2009-10-06 20:18:40 -04:00
Mathias Agopian
b26af23744 fix [2168531] have software-only gralloc buffer side-step the HAL 2009-10-06 17:00:25 -07:00
Mathias Agopian
3330b20303 fix [2167050] glTexImage2D code path buggy in SurfaceFlinger
When EGLImage extension is not available, SurfaceFlinger will fallback to using
glTexImage2D and glTexSubImage2D instead, which requires 50% more memory and an
extra copy. However this code path has never been exercised and had some bugs
which this patch fix.

Mainly the scale factor wasn't computed right when falling back on glDrawElements.
We also fallback to this mode of operation if a buffer doesn't have the adequate
usage bits for EGLImage usage.

This changes only code that is currently not executed. Some refactoring was needed to
keep the change clean. This doesn't change anything functionaly.
2009-10-06 17:00:25 -07:00
Android (Google) Code Review
76ca4bc006 Merge change I6b51a98a into eclair-mr2
* changes:
  Fixed issue #4098: Ringtone#getTitle does not close its cursor.
2009-10-06 19:32:25 -04:00
gwang@google.com
8db108ae16 am 521f4f3a: Merge change I3d6cf8aa into eclair
Merge commit '521f4f3af94e3a093a37af887d3e317a526b61a1' into eclair-mr2

* commit '521f4f3af94e3a093a37af887d3e317a526b61a1':
  Fix for bug 2158794. Hide MediaPlayer.invoke() and MediaPlayer.newRequest(), and Fix bad links in ToneGenerator documentation.
2009-10-06 15:40:42 -07:00
Xavier Ducrohet
f516144f01 am 5f9d4bae: layout lib tests cleanup
Merge commit '5f9d4bae03b2dfa9c1e43a6e01cacaa5a5326690' into eclair-mr2

* commit '5f9d4bae03b2dfa9c1e43a6e01cacaa5a5326690':
  layout lib tests cleanup
2009-10-06 15:40:37 -07:00
Xavier Ducrohet
bc86e3fd6f am 0a9d46b7: Add a test to make sure the replaced classes in layoutlib are correct.
Merge commit '0a9d46b7e741ccf7272bb69a4eef3c1f2adc91b7' into eclair-mr2

* commit '0a9d46b7e741ccf7272bb69a4eef3c1f2adc91b7':
  Add a test to make sure the replaced classes in layoutlib are correct.
2009-10-06 15:40:32 -07:00
Robert Greenwalt
9343e1aacc am 92b5caa4: Merge change Id8df149c into eclair
Merge commit '92b5caa4e21d48db6efeddba532d1546c6e686b1' into eclair-mr2

* commit '92b5caa4e21d48db6efeddba532d1546c6e686b1':
  Turn some logging back on in ConnectionManager
2009-10-06 15:40:27 -07:00
Android (Google) Code Review
0ad3f9f400 Merge change I3d6cf8aa into eclair
* changes:
  Fix for bug 2158794. Hide MediaPlayer.invoke() and MediaPlayer.newRequest(), and Fix bad links in ToneGenerator documentation.
2009-10-06 18:34:40 -04:00
Android (Google) Code Review
411922605a Merge change Id8df149c into eclair
* changes:
  Turn some logging back on in ConnectionManager
2009-10-06 17:38:03 -04:00
Jim Miller
cbaef85065 am f65161f1: Merge change If933b13d into eclair
Merge commit 'f65161f159db3d140c62f56d43e732c332af7773' into eclair-mr2

* commit 'f65161f159db3d140c62f56d43e732c332af7773':
  Fix for 2161835: Tweaks to rotary lock screen:
2009-10-06 14:37:04 -07:00
Jason Sams
ffb4f9f77c am 968a9571: Merge change I516c3191 into eclair
Merge commit '968a9571a391a2dbb0512c4fb99d04ab50861753' into eclair-mr2

* commit '968a9571a391a2dbb0512c4fb99d04ab50861753':
  Implement data push from scripts.  Fixes the problem where apps would have to poll to monitor a scripts state.
2009-10-06 14:36:59 -07:00
Android (Google) Code Review
7430c6b798 Merge change If933b13d into eclair
* changes:
  Fix for 2161835: Tweaks to rotary lock screen:
2009-10-06 17:34:17 -04:00
Android (Google) Code Review
56810d6b39 Merge change I516c3191 into eclair
* changes:
  Implement data push from scripts.  Fixes the problem where apps would have to poll to monitor a scripts state. Fix bug in StoreState where state could be overridden by the default unless the script used more than one state.
2009-10-06 17:32:13 -04:00
Wu-cheng Li
a6269b0bc8 am 962f2536: Merge change I547cff66 into eclair
Merge commit '962f253665e0c5cc8a29de9e59ce3992dad02440' into eclair-mr2

* commit '962f253665e0c5cc8a29de9e59ce3992dad02440':
  Add zoom functions and sendCommand.
2009-10-06 13:37:57 -07:00
Fred Quintana
3149c0054e am f83d9b3f: fix build breakage
Merge commit 'f83d9b3fcd74f2528b0acc74185d2d7bdd716942' into eclair-mr2

* commit 'f83d9b3fcd74f2528b0acc74185d2d7bdd716942':
  fix build breakage
2009-10-06 13:37:52 -07:00
Android (Google) Code Review
20f89768dc Merge change I547cff66 into eclair
* changes:
  Add zoom functions and sendCommand.
2009-10-06 16:32:44 -04:00
Wu-cheng Li
e6a550d02f Add zoom functions and sendCommand.
b2060030
2009-10-06 13:25:10 -07:00
Fred Quintana
97e65508a9 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-mr2

* commit '5bba632d877c2878384ff21566c8eb6a1a22f37b':
  - hide Entity and all its references
2009-10-06 12:04:41 -07:00
Suchi Amalapurapu
7853f19843 am 5163cd6d: Merge change I5be3d603 into eclair
Merge commit '5163cd6d1cb664977eb4473b98657c7e92ae430e' into eclair-mr2

* commit '5163cd6d1cb664977eb4473b98657c7e92ae430e':
  Make sdk version and code names static finals in PackageParser.
2009-10-06 11:48:00 -07:00
Android (Google) Code Review
7854a35326 Merge change I5be3d603 into eclair
* changes:
      Make sdk version and code names static finals in PackageParser.     Remove api to set these values.     Remove an unused method in AppSecurityPermissions
2009-10-06 14:36:43 -04:00
Daisuke Miyakawa
c43335ccfb am ccc214b2: Merge change I6a0b14bd into eclair
Merge commit 'ccc214b21edaaddf46960388ec4d3e3ca89a01ae' into eclair-mr2

* commit 'ccc214b21edaaddf46960388ec4d3e3ca89a01ae':
  Make VCardComposer create the instance for mHandlerList.
2009-10-06 10:53:52 -07:00
Android (Google) Code Review
5923f6f880 Merge change I6a0b14bd into eclair
* changes:
  Make VCardComposer create the instance for mHandlerList.
2009-10-06 13:48:11 -04:00
Evan Millar
0ac4e94c2e am 9c3c276a: Merge change I8333dcc4 into eclair
Merge commit '9c3c276afa7e2485e1a9f47e29ada8cb61b7b07c' into eclair-mr2

* commit '9c3c276afa7e2485e1a9f47e29ada8cb61b7b07c':
  New section header and divider assets.
2009-10-06 10:22:31 -07:00
Android (Google) Code Review
1812987a10 Merge change I8333dcc4 into eclair
* changes:
  New section header and divider assets.
2009-10-06 13:14:45 -04:00
Bjorn Bringert
5abccb41b3 am 030b2cf1: Merge change I76d7ba61 into eclair
Merge commit '030b2cf1eaab25890aa97e7e2a660ff5998e8639' into eclair-mr2

* commit '030b2cf1eaab25890aa97e7e2a660ff5998e8639':
  Pixel tweak search dialog to match search widget
2009-10-06 09:56:23 -07:00
Xavier Ducrohet
2295cb7d31 am 841a8eea: Merge change I24895c35 into eclair
Merge commit '841a8eea78479ad8a3c10e69a788adbeaef5a53d' into eclair-mr2

* commit '841a8eea78479ad8a3c10e69a788adbeaef5a53d':
  Reimplement all the method of Paint for layoutlib
2009-10-06 09:56:19 -07:00
Marco Nelissen
691e9a97f6 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-mr2

* commit 'c39d2e3c012fb96999991e30659a474f9f30f789':
  Music visualizer support hack.
2009-10-06 09:56:14 -07:00
Android (Google) Code Review
b68a3424fc Merge change I76d7ba61 into eclair
* changes:
  Pixel tweak search dialog to match search widget
2009-10-06 12:49:51 -04:00
Android (Google) Code Review
e336514381 Merge change I24895c35 into eclair
* changes:
  Reimplement all the method of Paint for layoutlib
2009-10-06 12:49:01 -04:00
Nick Pelly
8e17e43503 am 52cde727: Fix docs builds.
Merge commit '52cde7279bad58285704498eea57bdaf9e595b49' into eclair-mr2

* commit '52cde7279bad58285704498eea57bdaf9e595b49':
  Fix docs builds.
2009-10-06 07:21:35 -07:00
Nick Pelly
da1284a48b am 24bb9b8a: Provide an API for apps to use a dynamic RFCOMM channel and SDP record.
Merge commit '24bb9b8af4ff691538fe9e517e8156016b0da6cd' into eclair-mr2

* commit '24bb9b8af4ff691538fe9e517e8156016b0da6cd':
  Provide an API for apps to use a dynamic RFCOMM channel and SDP record.
2009-10-06 06:10:28 -07:00
Mike Lockwood
4f3562d29c am 7fdd67d3: Merge change I5b650a61 into eclair
Merge commit '7fdd67d3867ecbb6457a560b2428a8e9464d8ecd' into eclair-mr2

* commit '7fdd67d3867ecbb6457a560b2428a8e9464d8ecd':
  dumpstate: Emit a logcat message at beginning and end of execution.
2009-10-05 21:17:03 -07:00
Android (Google) Code Review
b3e21a7c93 Merge change I5b650a61 into eclair
* changes:
  dumpstate: Emit a logcat message at beginning and end of execution.
2009-10-06 00:09:07 -04:00
Tammo Spalink
e41e66a519 am 5c8dba21: Merge change I61aac7b3 into eclair
Merge commit '5c8dba21bf5e6a54f848c2e7f46dc86c27a09102' into eclair-mr2

* commit '5c8dba21bf5e6a54f848c2e7f46dc86c27a09102':
  Add PERIOD char to CDMA address sugar list.
2009-10-05 19:28:37 -07:00
Android (Google) Code Review
b608f6c350 Merge change I61aac7b3 into eclair
* changes:
  Add PERIOD char to CDMA address sugar list.
2009-10-05 22:19:46 -04:00
Fred Quintana
37e04a47b8 am 5fbaefc3: Merge change I4db3a5b3 into eclair
Merge commit '5fbaefc3d8840aac12b16458347b3c1ddbdaf542' into eclair-mr2

* commit '5fbaefc3d8840aac12b16458347b3c1ddbdaf542':
  fix a javadoc build breakage
2009-10-05 17:27:31 -07:00
Android (Google) Code Review
8657c4d319 Merge change I4db3a5b3 into eclair
* changes:
  fix a javadoc build breakage
2009-10-05 20:22:27 -04:00
Xavier Ducrohet
42aaa89b65 am a970bf52: Merge change I34f51342 into eclair
Merge commit 'a970bf52581667e88d82e0801e0774d7c9cdcb8f' into eclair-mr2

* commit 'a970bf52581667e88d82e0801e0774d7c9cdcb8f':
  Fix the layoutlib test to run from adt-tests.
2009-10-05 16:03:44 -07:00
Android (Google) Code Review
0718996fe0 Merge change I34f51342 into eclair
* changes:
  Fix the layoutlib test to run from adt-tests.
2009-10-05 18:58:36 -04:00
Dianne Hackborn
4b58db8458 am 68d881cf: Fix issue #2166755: BroadcastReceiver trying to return result during a non-ordered broadcast
Merge commit '68d881cf2d2b252f6f795cd64d43e316a1d736e5' into eclair-mr2

* commit '68d881cf2d2b252f6f795cd64d43e316a1d736e5':
  Fix issue #2166755: BroadcastReceiver trying to return result during a non-ordered broadcast
2009-10-05 15:58:13 -07:00
Xavier Ducrohet
e928fc93d1 am 71060f29: Merge change I8874a405 into eclair
Merge commit '71060f29855745893c122e8b93cf7a723186931b' into eclair-mr2

* commit '71060f29855745893c122e8b93cf7a723186931b':
  Refactor class/method names used by layoutlib_create.
2009-10-05 15:58:08 -07:00
Android (Google) Code Review
9c3fe94133 Merge change I8874a405 into eclair
* changes:
  Refactor class/method names used by layoutlib_create.
2009-10-05 18:37:36 -04:00
Romain Guy
046097565c am 89c76843: Merge change I9b771df3 into eclair
Merge commit '89c768435fc48a93c0af97f9f08e57a346b0a9fd' into eclair-mr2

* commit '89c768435fc48a93c0af97f9f08e57a346b0a9fd':
  Make sure AsyncTask sens a null result to onPostExecute() when cancelled.
2009-10-05 15:37:04 -07:00
Android (Google) Code Review
8ca6c38ceb Merge change I9b771df3 into eclair
* changes:
  Make sure AsyncTask sens a null result to onPostExecute() when cancelled.
2009-10-05 18:28:26 -04:00
Fred Quintana
d12e839b04 am 24f32b32: Merge change I89c40f50 into eclair
Merge commit '24f32b32f96eab8645a3ccf429c3d5694d2134ad' into eclair-mr2

* commit '24f32b32f96eab8645a3ccf429c3d5694d2134ad':
  fix a javadoc build breakage
2009-10-05 14:29:43 -07:00
Android (Google) Code Review
8bdf7aff38 Merge change I89c40f50 into eclair
* changes:
  fix a javadoc build breakage
2009-10-05 17:23:13 -04:00