Commit Graph

18628 Commits

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

* commit '9362ea760f565389f5accce7e17476d05510ed59':
  fix [2873058] Surface::dequeueBuffer blocks on last buffer, i.e. cannot dequeue all allocated buffers at once.
2010-07-28 16:36:08 -07:00
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
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
Gilles Debunne
05fc51d170 Merge "TextView with Selection Contextual Mode" 2010-07-28 15:49:40 -07:00
Christopher Tate
01d1669b89 am 1de9f490: am bae6fe24: Merge "Support streaming of compressed assets > 1 megabyte" into gingerbread
Merge commit '1de9f490b5c3f293b3748be3d4ccf3f78cdf460b'

* commit '1de9f490b5c3f293b3748be3d4ccf3f78cdf460b':
  Support streaming of compressed assets > 1 megabyte
2010-07-28 15:41:30 -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
James Dong
d1fb6b19fb am 8ddb8f81: am bc1daf01: Merge "Eliminate the linear cost associated with mSampleSizes.size()" into gingerbread
Merge commit '8ddb8f81902045ec8a53ec14b8fb936fd42517e0'

* commit '8ddb8f81902045ec8a53ec14b8fb936fd42517e0':
  Eliminate the linear cost associated with mSampleSizes.size()
2010-07-28 15:33:56 -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
Mike Lockwood
9ab6742c4b Merge changes I00d6980a,I814221b4,Id88603a5
* changes:
  CameraBrowser: Launch itself when a camera is attached to USB.
  Send Intents when PTP compatible devices are connected/disconnected to USB
  Give system server permission to access USB.
2010-07-28 14:59:45 -07:00
Kenny Root
572f29da76 am bba1eede: am f369a9b5: Remove stale temporary ASEC containers
Merge commit 'bba1eede35b356a50dfe12692c2ff30cd5de152d'

* commit 'bba1eede35b356a50dfe12692c2ff30cd5de152d':
  Remove stale temporary ASEC containers
2010-07-28 14:54:21 -07:00
Kenny Root
73592bd18d am 4b812738: am 56c02dc3: Merge "Fix getTempContainerId()" into gingerbread
Merge commit '4b812738c70be53e79ba8a6b9c93de14388d1311'

* commit '4b812738c70be53e79ba8a6b9c93de14388d1311':
  Fix getTempContainerId()
2010-07-28 14:54:16 -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
a191a80fe2 am 4e235622: am b1bb7180: am 3bf5c4cd: Merge "fix markup error bug:2871538" into froyo
Merge commit '4e235622bc37e54208b88a18251f3682495af41f'

* commit '4e235622bc37e54208b88a18251f3682495af41f':
  fix markup error
2010-07-28 14:30:21 -07:00
Jeff Brown
2ef6cdec33 am 9795a25d: am 6d0fec2d: Refactor input reader to support new device types more easily.
Merge commit '9795a25da060f9a7df87da8ab43fb1086d4322a5'

* commit '9795a25da060f9a7df87da8ab43fb1086d4322a5':
  Refactor input reader to support new device types more easily.
2010-07-28 14:27:55 -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
Jason Sams
af18ab7c0b Merge "Cleanup sendToClient and add rsGetDt(). Remove legacy implemtation of matrix calls which were moved to llvm bc." 2010-07-28 14:14:48 -07:00
Dan Egnor
a024fac5ec am 8190f485: am b350bec5: am 17876aa5: Minor changes to ContentProvider javadoc to improve consistency.
Merge commit '8190f485539c36803489dcf5f198d03ed87ae8f9'

* commit '8190f485539c36803489dcf5f198d03ed87ae8f9':
  Minor changes to ContentProvider javadoc to improve consistency.
2010-07-28 12:44:22 -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
Irfan Sheriff
4e21e60520 Merge "sticky broadcasts dont need system ready check" 2010-07-28 12:22:38 -07:00
James Dong
e5a4c8f1f7 am 84665f6d: 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 '84665f6dc2d0b5dfa6a46463677c51f2b670e511'

* commit '84665f6dc2d0b5dfa6a46463677c51f2b670e511':
  Reduce memory usage by the MP4 file writer
2010-07-28 12:21:37 -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
5e8416b3d1 am cb51115c: am 5587bb7e: Merge "Interleave the audio and video by default - default interleave duration is set to 1 second" into gingerbread
Merge commit 'cb51115cca81ba47d00aa344f6ed16d1056b056b'

* commit 'cb51115cca81ba47d00aa344f6ed16d1056b056b':
  Interleave the audio and video by default
2010-07-28 12:02:59 -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
Xia Wang
c3b6dea724 Merge "Wait for broadcast even if the network state has been changed. bug: 2863356" 2010-07-28 11:34:18 -07:00
Michael Kolb
10b6c9ff6e Merge "moved target_content user agent parameter to strings added target content parameter for xlarge screen configuration" 2010-07-28 11:06:50 -07:00
Joe Onorato
6692b0d47b am d3f6c1fa: 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 'd3f6c1fa45d0b9aaf467159953ee4bea2ea89188'

* commit 'd3f6c1fa45d0b9aaf467159953ee4bea2ea89188':
  Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.
2010-07-28 11:05:29 -07:00
Mike Lockwood
10bdb59d41 Merge "Add new system service CountryDetector" 2010-07-28 11:04:18 -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
Chet Haase
2f334347a7 Merge "Add ability to instantiate PropertyAnimator objects with single "to" value." 2010-07-28 09:06:01 -07:00
Eric Laurent
7ca608db56 am 6fa88882: am 62d83a0c: Merge "Audio effects: modified command() parameter types." into gingerbread
Merge commit '6fa8888254deb4961dc64c6ac03dc103c9cd8bcf'

* commit '6fa8888254deb4961dc64c6ac03dc103c9cd8bcf':
  Audio effects: modified command() parameter types.
2010-07-28 07:53:24 -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
22e8963e0d am d5786b98: am c40d714c: Merge "Tethering: Use new ACTION_USB_STATE broadcast to monitor USB connected state" into gingerbread
Merge commit 'd5786b982c90632a4b35fd2d984c4edc4bbdfb0b'

* commit 'd5786b982c90632a4b35fd2d984c4edc4bbdfb0b':
  Tethering: Use new ACTION_USB_STATE broadcast to monitor USB connected state
2010-07-28 04:18:10 -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
Romain Guy
622b85f769 Merge "Generate shaders to cover all possible cases." 2010-07-27 19:53:33 -07:00
Brad Fitzpatrick
a2a56526df am 931ee98c: am b7304593: Merge "Cap the size of StrictMode buffering we do before calling DropBox." into gingerbread
Merge commit '931ee98cc05aedaf0a7cdf0b7ec503a8586359f5'

* commit '931ee98cc05aedaf0a7cdf0b7ec503a8586359f5':
  Cap the size of StrictMode buffering we do before calling DropBox.
2010-07-27 18:39:21 -07:00