Commit Graph

17088 Commits

Author SHA1 Message Date
Mathias Agopian
e9c4f70a9f am 9f2a91bc: Merge "fix [2873058] Surface::dequeueBuffer blocks on last buffer, i.e. cannot dequeue all allocated buffers at once." into gingerbread
Merge commit '9f2a91bc2b01c2cc60f73a0bae673225fdddec09' into gingerbread-plus-aosp

* commit '9f2a91bc2b01c2cc60f73a0bae673225fdddec09':
  fix [2873058] Surface::dequeueBuffer blocks on last buffer, i.e. cannot dequeue all allocated buffers at once.
2010-07-28 16:33:23 -07:00
Kenny Root
937cd1b707 Add unistd.h for size_t typedef to fix sim-eng
Change-Id: Ida4f1742547f39539b601f13182c722aa7cf863e
2010-07-28 16:31:24 -07:00
Mathias Agopian
edae28809a Merge "fix [2873058] Surface::dequeueBuffer blocks on last buffer, i.e. cannot dequeue all allocated buffers at once." into gingerbread 2010-07-28 16:30:56 -07:00
Christopher Tate
473aedf59d am bae6fe24: Merge "Support streaming of compressed assets > 1 megabyte" into gingerbread
Merge commit 'bae6fe242ff9a97840ff0c5d9d87c0575d261682' into gingerbread-plus-aosp

* commit 'bae6fe242ff9a97840ff0c5d9d87c0575d261682':
  Support streaming of compressed assets > 1 megabyte
2010-07-28 15:38:38 -07:00
Christopher Tate
46f28d328a Merge "Support streaming of compressed assets > 1 megabyte" into gingerbread 2010-07-28 15:36:48 -07:00
Christopher Tate
a45a8008c6 Support streaming of compressed assets > 1 megabyte
Compressed assets larger than one megabyte are now decompressed on demand
rather than being decompressed in their entirety and held in memory.  Reading
the data in order is relatively efficient, as is seeking forward in the stream.
Seeking backwards is supported, but requires reprocessing the compressed data
from the beginning, so is very inefficient.

In addition, the size limit on compressed assets has been eliminated.

Change-Id: I6e68247957e6c53e7e8ba70d12764695f1723bad
2010-07-28 15:33:28 -07:00
James Dong
eb4a8d6850 am bc1daf01: Merge "Eliminate the linear cost associated with mSampleSizes.size()" into gingerbread
Merge commit 'bc1daf016020ce022ceb971f09e862da5ee82b1d' into gingerbread-plus-aosp

* commit 'bc1daf016020ce022ceb971f09e862da5ee82b1d':
  Eliminate the linear cost associated with mSampleSizes.size()
2010-07-28 15:31:09 -07:00
James Dong
6b60f5860d Merge "Eliminate the linear cost associated with mSampleSizes.size()" into gingerbread 2010-07-28 15:28:54 -07:00
Kenny Root
7a8c29e333 am f369a9b5: Remove stale temporary ASEC containers
Merge commit 'f369a9b5f7b2ae75875753caf90ec68fd9dbc144' into gingerbread-plus-aosp

* commit 'f369a9b5f7b2ae75875753caf90ec68fd9dbc144':
  Remove stale temporary ASEC containers
2010-07-28 14:51:33 -07:00
Kenny Root
c4b09f9748 am 56c02dc3: Merge "Fix getTempContainerId()" into gingerbread
Merge commit '56c02dc3d325bab8549ec34b9d6aa7c62ef742d0' into gingerbread-plus-aosp

* commit '56c02dc3d325bab8549ec34b9d6aa7c62ef742d0':
  Fix getTempContainerId()
2010-07-28 14:51:29 -07:00
Kenny Root
5f482e915f Merge "Fix getTempContainerId()" into gingerbread 2010-07-28 14:48:40 -07:00
Scott Main
5cde867d20 am b1bb7180: am 3bf5c4cd: Merge "fix markup error bug:2871538" into froyo
Merge commit 'b1bb7180ec3446208ea717d96f6a507ea9955a13' into gingerbread-plus-aosp

* commit 'b1bb7180ec3446208ea717d96f6a507ea9955a13':
  fix markup error
2010-07-28 14:27:13 -07:00
Jeff Brown
7be99a70f9 am 6d0fec2d: Refactor input reader to support new device types more easily.
Merge commit '6d0fec2de3601821f4f44eeb7d7deedebb2b7117' into gingerbread-plus-aosp

* commit '6d0fec2de3601821f4f44eeb7d7deedebb2b7117':
  Refactor input reader to support new device types more easily.
2010-07-28 14:25:05 -07:00
Scott Main
7d3bc349d9 am 3bf5c4cd: Merge "fix markup error bug:2871538" into froyo
Merge commit '3bf5c4cd30f8bd598842d8ded5f1655406b5c27a' into gingerbread

* commit '3bf5c4cd30f8bd598842d8ded5f1655406b5c27a':
  fix markup error
2010-07-28 14:23:16 -07:00
Scott Main
9c990d4d8a Merge "fix markup error bug:2871538" into froyo 2010-07-28 14:20:18 -07:00
Jeff Brown
e57e895080 Refactor input reader to support new device types more easily.
Refactored the input reader so that each raw input protocol is handled
by a separate subclass of the new InputMapper type.  This way, behaviors
pertaining to keyboard, trackballs, touchscreens, switches and other
devices are clearly distinguished for improved maintainability.

Added partial support for describing capabilities of input devices
(incomplete and untested for now, will be fleshed out in later commits).

Simplified EventHub interface somewhat since InputReader is taking over
more of the work.

Cleaned up some of the interactions between InputManager and
WindowManagerService related to reading input state.

Fixed swiping finger from screen edge into display area.

Added logging of device information to 'dumpsys window'.

Change-Id: I17faffc33e3aec3a0f33f0b37e81a70609378612
2010-07-28 14:16:15 -07:00
Dan Egnor
0a419c7179 am b350bec5: am 17876aa5: Minor changes to ContentProvider javadoc to improve consistency.
Merge commit 'b350bec514eb9fee473e4ef62680c53e992dc49b' into gingerbread-plus-aosp

* commit 'b350bec514eb9fee473e4ef62680c53e992dc49b':
  Minor changes to ContentProvider javadoc to improve consistency.
2010-07-28 12:42:16 -07:00
Dan Egnor
43d71c5805 am 17876aa5: Minor changes to ContentProvider javadoc to improve consistency.
Merge commit '17876aa586cc9acfb3e5b909c14b9e73537a1a8d' into gingerbread

* commit '17876aa586cc9acfb3e5b909c14b9e73537a1a8d':
  Minor changes to ContentProvider javadoc to improve consistency.
2010-07-28 12:40:16 -07:00
James Dong
a4fd3232e2 am 7e397842: Reduce memory usage by the MP4 file writer - Don\'t store timestamp for each output sample - Don\'t store timestamp for statistical data collection if the collection of statistical data is not requested
Merge commit '7e397842d53a4242a019daa4b234910273121c30' into gingerbread-plus-aosp

* commit '7e397842d53a4242a019daa4b234910273121c30':
  Reduce memory usage by the MP4 file writer
2010-07-28 12:19:33 -07:00
James Dong
ea38955670 am 5587bb7e: Merge "Interleave the audio and video by default - default interleave duration is set to 1 second" into gingerbread
Merge commit '5587bb7e375c17c1320918e6f473625af1f5e5ac' into gingerbread-plus-aosp

* commit '5587bb7e375c17c1320918e6f473625af1f5e5ac':
  Interleave the audio and video by default
2010-07-28 12:00:58 -07:00
James Dong
41af3d253e Merge "Interleave the audio and video by default - default interleave duration is set to 1 second" into gingerbread 2010-07-28 11:58:12 -07:00
Joe Onorato
eaa8fbd0bd am 0c39b6c6: Merge "Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference." into gingerbread
Merge commit '0c39b6c65bcb96ed6438c7d792a67708409d8f0f' into gingerbread-plus-aosp

* commit '0c39b6c65bcb96ed6438c7d792a67708409d8f0f':
  Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.
2010-07-28 10:16:39 -07:00
Joe Onorato
9996342da5 Merge "Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference." into gingerbread 2010-07-28 09:53:12 -07:00
Eric Laurent
78fa144626 am 62d83a0c: Merge "Audio effects: modified command() parameter types." into gingerbread
Merge commit '62d83a0c894b72d9abda1340d278d2aeec11e0fb' into gingerbread-plus-aosp

* commit '62d83a0c894b72d9abda1340d278d2aeec11e0fb':
  Audio effects: modified command() parameter types.
2010-07-28 07:51:02 -07:00
Eric Laurent
de63b463a5 Merge "Audio effects: modified command() parameter types." into gingerbread 2010-07-28 07:48:49 -07:00
Mike Lockwood
c1bab16956 am c40d714c: Merge "Tethering: Use new ACTION_USB_STATE broadcast to monitor USB connected state" into gingerbread
Merge commit 'c40d714ca520257bcb5ef2e03e83ea3273d3a0ec' into gingerbread-plus-aosp

* commit 'c40d714ca520257bcb5ef2e03e83ea3273d3a0ec':
  Tethering: Use new ACTION_USB_STATE broadcast to monitor USB connected state
2010-07-28 04:11:03 -07:00
Mike Lockwood
1b55aad8ef Merge "Tethering: Use new ACTION_USB_STATE broadcast to monitor USB connected state" into gingerbread 2010-07-28 04:04:18 -07:00
Mathias Agopian
208cb07724 fix [2873058] Surface::dequeueBuffer blocks on last buffer, i.e. cannot dequeue all allocated buffers at once.
this situation happened when the last buffer needed to be resized
(or allocated, the first time). the assumption was that the buffer
was in use by SF itself as the current buffer (obviously, this
assumption made no sense when the buffer had never been allocated, btw).

the system would wait until some other buffer became the "front" buffer.

we fix this problem by entirely removing the requirement that the
buffer being resized cannot be the front buffer. instead, we just
allocate a new buffer and replace the front buffer by the new one.

the downside is that this uses more memory (an extra buffer) for a
brief amount of time while the old buffer is being reallocated and
before it has actually been replaced.

Change-Id: I022e4621209474ceb1c671b23deb4188eaaa7285
2010-07-27 20:11:35 -07:00
Brad Fitzpatrick
795c4cc84c am b7304593: Merge "Cap the size of StrictMode buffering we do before calling DropBox." into gingerbread
Merge commit 'b73045935cd8ec5d1a1c5e7a7ca800448b5789ea' into gingerbread-plus-aosp

* commit 'b73045935cd8ec5d1a1c5e7a7ca800448b5789ea':
  Cap the size of StrictMode buffering we do before calling DropBox.
2010-07-27 18:37:20 -07:00
Brad Fitzpatrick
6c595a17f5 Merge "Cap the size of StrictMode buffering we do before calling DropBox." into gingerbread 2010-07-27 18:34:08 -07:00
Steve Howard
022ed1dece am 9b8e5566: Merge "One last change to current.xml for new download manager API" into gingerbread
Merge commit '9b8e5566f99c55222db4127719440272f63a5361' into gingerbread-plus-aosp

* commit '9b8e5566f99c55222db4127719440272f63a5361':
  One last change to current.xml for new download manager API
2010-07-27 16:56:52 -07:00
Steve Howard
38fa7eccc1 Merge "One last change to current.xml for new download manager API" into gingerbread 2010-07-27 16:55:14 -07:00
Brad Fitzpatrick
3b54d4533a am 4d544376: am 86c035f0: Merge "COMMENT ONLY change to clarify ContentProvider documentation." into froyo
Merge commit '4d5443762bd2b44b28edc2f2f75728911d70eac1' into gingerbread-plus-aosp

* commit '4d5443762bd2b44b28edc2f2f75728911d70eac1':
  COMMENT ONLY change to clarify ContentProvider documentation.
2010-07-27 16:54:40 -07:00
Brad Fitzpatrick
928b1c94a5 am 86c035f0: Merge "COMMENT ONLY change to clarify ContentProvider documentation." into froyo
Merge commit '86c035f0d176be9cb06b1e4f2390c25701417586' into gingerbread

* commit '86c035f0d176be9cb06b1e4f2390c25701417586':
  COMMENT ONLY change to clarify ContentProvider documentation.
2010-07-27 16:52:12 -07:00
Brad Fitzpatrick
be2ec77f92 Merge "COMMENT ONLY change to clarify ContentProvider documentation." into froyo 2010-07-27 16:44:53 -07:00
Steve Howard
5c7efd4e0e am 7feab347: Merge "Un-@hide new download manager public API." into gingerbread
Merge commit '7feab3470156c7864fe159115d575c16f0974493' into gingerbread-plus-aosp

* commit '7feab3470156c7864fe159115d575c16f0974493':
  Un-@hide new download manager public API.
2010-07-27 16:37:39 -07:00
Steve Howard
1faba30b39 Merge "Un-@hide new download manager public API." into gingerbread 2010-07-27 16:29:37 -07:00
Brad Fitzpatrick
9a63af4ad6 am 10f7c1b8: Merge "Explicitly mention again that startCommand() runs on the main thread." into gingerbread
Merge commit '10f7c1b8ecf110fd9c646eb3fcb51e6ee74c5885' into gingerbread-plus-aosp

* commit '10f7c1b8ecf110fd9c646eb3fcb51e6ee74c5885':
  Explicitly mention again that startCommand() runs on the main thread.
2010-07-27 15:21:30 -07:00
Brad Fitzpatrick
55fcdbc397 Merge "Explicitly mention again that startCommand() runs on the main thread." into gingerbread 2010-07-27 15:19:08 -07:00
Brad Fitzpatrick
53456e51ce am 84c924a6: Merge "Replace several IPCThreadState::get() lookups with one." into gingerbread
Merge commit '84c924a6c53cb63ca018013c9fda0077413d0005' into gingerbread-plus-aosp

* commit '84c924a6c53cb63ca018013c9fda0077413d0005':
  Replace several IPCThreadState::get() lookups with one.
2010-07-27 14:02:01 -07:00
Brad Fitzpatrick
834772c15b Merge "Replace several IPCThreadState::get() lookups with one." into gingerbread 2010-07-27 13:59:47 -07:00
Brad Fitzpatrick
70081a1511 Replace several IPCThreadState::get() lookups with one.
Also, make StrictMode's ThreadLocal final.

Change-Id: I08d400ed254fa67bb7a3dae1227f205a54c00df0
2010-07-27 12:28:57 -07:00
Dan Egnor
78e3a74069 am 499bee34: Merge "Remove a log message Jason doesn\'t like" into gingerbread
Merge commit '499bee34c40945f898b7561ca7792ded5b974852' into gingerbread-plus-aosp

* commit '499bee34c40945f898b7561ca7792ded5b974852':
  Remove a log message Jason doesn't like
2010-07-27 10:28:38 -07:00
Dan Egnor
38e04ae4f9 Merge "Remove a log message Jason doesn't like" into gingerbread 2010-07-27 10:22:58 -07:00
Joe Onorato
55578bc652 am 76d9bf52: am 8c65ee2d: Merge "Add a method to let a properly permissioned app directly manipulate the user activity timeout. We should come up with a better API for this, but this is for a last minute power manager hack to turn off the screen sooner after a phone
Merge commit '76d9bf52f31b8f31f64348b736422861c90ab463' into gingerbread-plus-aosp

* commit '76d9bf52f31b8f31f64348b736422861c90ab463':
  Add a method to let a properly permissioned app directly
2010-07-27 09:19:48 -07:00
Joe Onorato
385adbdbe3 am 8c65ee2d: Merge "Add a method to let a properly permissioned app directly manipulate the user activity timeout. We should come up with a better API for this, but this is for a last minute power manager hack to turn off the screen sooner after a phone call ends." i
Merge commit '8c65ee2d509db7dcb50ce4530d52eb5bdca3f917' into gingerbread

* commit '8c65ee2d509db7dcb50ce4530d52eb5bdca3f917':
  Add a method to let a properly permissioned app directly
2010-07-27 09:14:42 -07:00
Joe Onorato
38723b069c Merge "Add a method to let a properly permissioned app directly manipulate the user activity timeout. We should come up with a better API for this, but this is for a last minute power manager hack to turn off the screen sooner after a phone call ends." into froyo 2010-07-27 09:05:05 -07:00
Eric Laurent
48f5248621 am ca57d1cc: Audio Effects: added methods to effects java classes to store and load current effect settings in a single call.
Merge commit 'ca57d1cc89d65dfbd59c749c5736574cd08c7bd3' into gingerbread-plus-aosp

* commit 'ca57d1cc89d65dfbd59c749c5736574cd08c7bd3':
  Audio Effects: added methods to effects java classes to store and load current effect settings in
2010-07-27 01:54:30 -07:00
Mathias Agopian
cee79391c8 fix [2870926] Issue 9802: EGL wrapper has not been implemented correctly for eglQuerySurface().
rework how our EGL wrapper manages EGLConfig:

- we now store the EGLConfig with the EGLSurface and EGLContext
  so that we can have easy access to it from eglQueryContext
  and eglQuerySurface.

- EGLConfig now are an index into a sorted table of egl_config_t,
  we use a binary search to retrieve our EGLConfig (the index) from
  the implementation's EGLConfig.

- egl_config_t keeps track of the implementation's index,
  EGLConfig and CONFIG_ID as well as our CONFIG_ID.

In many ways, this implementation is simpler and more robust, as it doesn't
assume anything about the number of implementations nor what EGLConfig is
made of (the previous code assumed EGLConfig didn't usem more than 24-bits).

Change-Id: Id5abe923aacb6e1fd2b63bd8c15d7b04ae824922
2010-07-26 21:14:59 -07:00
Dirk Dougherty
eab0bb1098 am 2b989e1f: am 0ac8ac30: Doc change: Add docs for licensing service.
Merge commit '2b989e1f7d08efd51652b56b1cb1fef76a1e8ab1' into gingerbread-plus-aosp

* commit '2b989e1f7d08efd51652b56b1cb1fef76a1e8ab1':
  Doc change: Add docs for licensing service.
2010-07-26 20:04:28 -07:00