Commit Graph

37450 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
2f7b9bf2d1 am 5bb3129c: (-s ours) am a2616220: am 5e57c2cf: Merge "Stagefright: Return error if codec takes too long to return a buffer."
* commit '5bb3129c7eabce34d7c1469826e1795d4b225bb3':
  Stagefright: Return error if codec takes too long to return a buffer.
2011-08-01 14:10:39 -07:00
Chia-chi Yeh
d01002ef74 Merge "Revert "Unhide APIs for user space VPN."" 2011-08-01 14:09:58 -07:00
Mathias Agopian
81a6335052 connect/disconnect is now called from our EGL wrapper
the original connect/disconnect hooks are deprecated
and replace by api_connect/api_disconnect. the original
hooks are no no-ops.
api_connect/api_disconnect is now only called from the
android framework.

Bug: 5057915
Change-Id: I8ca64cd1acd6cabf915bf54689ec2e5f6dfa495a
2011-08-01 14:06:20 -07:00
Romain Guy
73c954fdff Merge "Plug memory leak in EditText." 2011-08-01 14:02:54 -07:00
Jean-Baptiste Queru
0581cb2681 am a2616220: am 5e57c2cf: Merge "Stagefright: Return error if codec takes too long to return a buffer."
* commit 'a2616220d24b994e79fcbf33f7ce8a311fa9e8ac':
  Stagefright: Return error if codec takes too long to return a buffer.
2011-08-01 13:59:02 -07:00
Jean-Baptiste Queru
46b0fc9b2d am 5e57c2cf: Merge "Stagefright: Return error if codec takes too long to return a buffer."
* commit '5e57c2cf83ef62e9887592b46a4c3352662fb988':
  Stagefright: Return error if codec takes too long to return a buffer.
2011-08-01 13:55:45 -07:00
Jean-Baptiste Queru
ae182598a2 Merge "Stagefright: Return error if codec takes too long to return a buffer." 2011-08-01 13:43:07 -07:00
Jamie Gennis
05ca9998cd Merge "SurfaceFlinger: use async mode for video & cam" 2011-08-01 13:40:29 -07:00
Bjorn Bringert
1ea2dd4bcc Merge "Fix exception when a focused item is detached." 2011-08-01 13:39:30 -07:00
Andreas Huber
23d8c30741 Merge "Fix NALU extraction of unit starts with a 0x00 nalType" 2011-08-01 13:26:11 -07:00
Jamie Gennis
35770345e4 Merge "SurfaceTexture: allow set_buffer_count(2)" 2011-08-01 13:25:03 -07:00
Romain Guy
e346719a8f Merge "Fixing initialization cleanup in activity instrumentation test case" 2011-08-01 13:21:31 -07:00
Dianne Hackborn
822c0b022e Merge "Hide permissions that are not available to apps." 2011-08-01 12:23:47 -07:00
Mathias Agopian
961d594575 Merge "improve GraphicAllocator dump method" 2011-08-01 12:15:07 -07:00
Jeff Brown
3a95b56682 Merge "Tweak hover for better accessibility and compatibility. Bug: 5087943" 2011-08-01 12:14:24 -07:00
Jamie Gennis
1ad0da83fd Merge "SurfaceFlinger: abandon Layer SurfaceTextures" 2011-08-01 12:10:47 -07:00
Eric Fischer
37363f858a am 72b7a7d9: (-s ours) am f01b3cfa: (-s ours) am c0e5967f: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '72b7a7d90b631a703681751c02f1447e3c75ccb0':
  Import revised translations.  DO NOT MERGE
2011-08-01 11:23:08 -07:00
Eric Fischer
45923cdc11 am f01b3cfa: (-s ours) am c0e5967f: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit 'f01b3cfa9ac2869e3762a90917569186039a9665':
  Import revised translations.  DO NOT MERGE
2011-08-01 11:19:59 -07:00
Eric Fischer
c1cf37d145 am c0e5967f: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit 'c0e5967fb9cb5328623a3be8f0c270cbbfe76ed7':
  Import revised translations.  DO NOT MERGE
2011-08-01 11:17:17 -07:00
Eric Fischer
061ad637f7 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2011-08-01 11:15:58 -07:00
Andreas Huber
290fa96983 Merge "Start playing live streaming HLS content from the first segment." 2011-08-01 10:46:51 -07:00
Matthew Xie
78dede3618 Merge "Change setDevicePropertyNative to no block." 2011-08-01 10:20:30 -07:00
Luca Zanolin
13e0e40ecd Merge "Sort the suggestions based based on the length of the text they are attached too." 2011-08-01 09:51:29 -07:00
Mike Lockwood
71521279a6 Merge "MediaScanner: Move genre table management to MediaProvider" 2011-08-01 09:31:57 -07:00
Justin Ho
edf865ad4d Merge "Update list_ states Bug: 5076695" 2011-08-01 07:27:11 -07:00
Jeff Brown
5873ce46ad Refactor input reader to add stylus support.
Bug: 5064702

Introduced the concept of an InputListener to further decouple
the InputReader from the InputDispatcher.  The InputListener
exposes just the minimum interface that the InputReader needs
to communicate with the outside world.  The InputReader
passes arguments to the InputListener by reference, which makes
it easy to queue them up.

Consolidated all of the InputReader locks into one simple global
Mutex.  The reason this wasn't done before was due to potential
re-entrance in outbound calls to the InputDispatcher.  To fix this,
the InputReader now queues up all of the events it wants to send
using a QueuedInputListener, then flushes them outside of the
critical section after all of the event processing is finished.
Removing all of the InputMapper locks greatly simplifies the
implementation.

Added tests for new stylus features such as buttons, tool types,
and hovering.

Added some helpers to BitSet32 to handle common code patterns
like finding the first marked bit and clearing it.

Fixed a bug in VelocityTracker where the wrong pointer trace
could get cleared when handling ACTION_POINTER_DOWN.  Oops.

Changed PointerCoords so it no longer stores useless zero
axis values.  Removed editAxisValue because it is not very
useful when all zero value axes are absent and therefore
cannot be edited in place.

Added dispatch of stylus hover events.

Added support for distance and tool types.

Change-Id: I4cf14d134fcb1db7d10be5f2af7b37deef8f8468
2011-07-31 15:38:09 -07:00
Jamie Gennis
cb6c755234 SurfaceFlinger: use async mode for video & cam
This change makes SurfaceFlinger's SurfaceTexture objects default to
async mode whenever a camera or video decoder connects.  This behavior
can be disabled by #defining NEVER_DEFAULT_TO_ASYNC_MODE.

Change-Id: I8965951d1775915da180e4af298dd7af3afafecc
2011-07-30 16:47:44 -07:00
Jamie Gennis
1c121f68fc SurfaceTexture: allow set_buffer_count(2)
This change relaxes an error check in SurfaceTexture::setBufferCount to
allow clients to explicitly set a buffer count of 2.  The clients that
will do this are camera and video decode.  Previously it was thought
that for those clients we would always use async mode, which requires a
minimum of 3 buffers.  However, we now believe that for some devices it
may make sense to use synchronous mode (with 2 buffers) to reduce memory
usage.

Bug: 5088418
Change-Id: I620a0ef75075745be9d6c8219e0246aaf33ba950
2011-07-30 16:00:11 -07:00
Jamie Gennis
dbe6486ca1 SurfaceFlinger: abandon Layer SurfaceTextures
This change makes the Layer::onRemoved method call
SurfaceTextures::abandon on the layer's SurfaceTexture.  This will cause
all client-initiated operations on the SurfaceTexture to fail.  In
particular, this will result in an error on the client side, rather than
a deadlock when removing a layer that used a SurfaceTexture in
synchronous mode.

Change-Id: I14014d00369f29560a21b606831edee432bb8867
Bug: 5020874
2011-07-30 14:38:20 -07:00
Justin Ho
8d944d254b Merge "Updated backgrounds Bug: 5076695" 2011-07-29 16:55:51 -07:00
Mathias Agopian
a947de88e7 improve GraphicAllocator dump method
GraphicAllocator debugging cannot deal with
custom HAL formats. make this more obvious in the
log.

Change-Id: I202e58a7f213f32e725aa4eac62cdf6e50ca5894
2011-07-29 16:35:41 -07:00
Jamie Gennis
96cdaaefa0 Merge "SurfaceFlinger: fix a layer occlusion bug" 2011-07-29 16:18:38 -07:00
Justin Ho
79f24d2902 Merge "Removing unnecessary textfield_active assets Bug: 5094669" 2011-07-29 15:56:15 -07:00
Scott Main
663396e0a4 Merge "add since flag for ICS" 2011-07-29 15:10:27 -07:00
Jesse Wilson
003b7ffbb2 Merge "Restore the 'final' bit on DataInputStream.read()" 2011-07-29 14:41:01 -07:00
Svetoslav Ganov
d5ab640263 Merge "Improving accessibility feedback for two state widgets." 2011-07-29 14:06:44 -07:00
Kristian Monsen
70b5c841e6 Merge "Part of fix for bug 4997380: Some error types unknown to SslError" 2011-07-29 12:35:45 -07:00
Derek Sollenberger
b0d9a46694 Merge "Add a runtime switch between Raster and Ganesh rendering modes." 2011-07-29 12:34:32 -07:00
Derek Sollenberger
b17fe78fe6 Merge "resolved conflicts for merge of 13639b0d to master" 2011-07-29 12:28:16 -07:00
Mike Lockwood
ba58c0b42b Merge "Clean up USB configuration switching logic and beef up error handling" 2011-07-29 12:13:04 -07:00
Gilles Debunne
e303f673f5 Merge "New interaction model for suggestions" 2011-07-29 11:47:12 -07:00
Derek Sollenberger
569d6c278e resolved conflicts for merge of 13639b0d to master
Change-Id: I6fb2ac2702fc662c1892537de6d4db20d5e709d6
2011-07-29 14:39:06 -04:00
Amith Yamasani
d5b380004c Merge "Don't submit a query if it's whitespace only." 2011-07-29 11:28:37 -07:00
Derek Sollenberger
9dd6682a5a Merge "resolved conflicts for merge of b7f09f28 to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-07-29 11:24:37 -07:00
Svetoslav Ganov
6bd27c915f Merge "InputFilter not updated on global accessibility change." 2011-07-29 11:22:42 -07:00
Christopher Tate
0900cf89bb Merge "Require the current backup pw in all backup/restore operations" 2011-07-29 11:20:45 -07:00
Derek Sollenberger
33e86c7a91 resolved conflicts for merge of b7f09f28 to honeycomb-plus-aosp
Change-Id: Iebde13c41a2adf4e693d87e808cb0659f913e4e6
2011-07-29 14:16:18 -04:00
Robert Greenwalt
cbbbb2ae26 am a128f5f8: am 1a230885: Merge "Fix NPE when going from proxy to no proxy." into honeycomb-LTE
* commit 'a128f5f8c952d7f519f64882792e832a4e75e2c8':
  Fix NPE when going from proxy to no proxy.
2011-07-29 10:55:58 -07:00
Daniel Sandler
472f6d102c Merge "Quick fix for NPE in updateNotification()." 2011-07-29 10:53:17 -07:00
Robert Greenwalt
f9c0f5aa4f am 1a230885: Merge "Fix NPE when going from proxy to no proxy." into honeycomb-LTE
* commit '1a230885b356256e91b3bf006ec72213ba6f8f76':
  Fix NPE when going from proxy to no proxy.
2011-07-29 10:53:16 -07:00