summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Bug 4364249 Play position is 0 after flushing AudioTrackJean-Michel Trivi2011-08-251-0/+1
| | | | | | | | | | | | | AudioTrack::stop() is not synchronous, so a stop() followed by flush(), which is synchronous, will not always report a playhead position of 0 after being called. This CL adds a flag to mark a track as flushed, and report the correct playhead position in this state. Bug 5217011 has been created to address the real issue in the future, where flush could be made synchronous, to properly address bug 4364249. Change-Id: Icf989d41a6bcd5985bb87764c287f3edb7e26d12
* Merge "Testing the GL/ CPU encoding w/ Gralloc buffers"Pannag Sanketi2011-08-242-5/+13
|\
| * Testing the GL/ CPU encoding w/ Gralloc buffersPannag Sanketi2011-08-242-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the test for Gralloc buffers based encoding. contains a combination of two main changes: 1. GL based encoding tests added to SurfaceMediaSource_test 2. SurfaceMediaSource ::read() colorformat The SurfaceMediaSource::getformat() sets it to OMX_COLOR_FormatAndroidOpaque. The omx encoder needs to interpret that colorformat and reads the format from the Gralloc buffers directly Change-Id: Iee2fe8901384109a4952e1d6c528c59eb01eb5b1
* | SurfaceFlinger: use the HWC gralloc usage bitJamie Gennis2011-08-221-0/+1
|/ | | | | | | | This change makes SurfaceFlinger always use the GRALLOC_USAGE_HW_COMPOSER usage bit when allocating buffers that may be passed to the HWComposer. Change-Id: I70362a8ede2b359fb2046853f85149d597465817
* Input system bug fixes, particularly for stylus.Jeff Brown2011-08-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5049148 Finished stylus support, including support for indirect stylus and mouse tools. Added TILT axis. When stylus tilt X/Y is available, it is transformed into an orientation and tilt inclination which is a more convenient representation and a simpler extension to the exiting API. Touch devices now only report touch data using a single input source. Previously touch devices in pointer mode would report both absolute touch pad data and cooked pointer gestures. Now we just pick one. The touch device switches modes as needed when the focused application enables/disables pointer gestures. This change greatly simplifies the code and reduces the load on the input dispatcher. Fixed an incorrect assumption that the value of ABS_(MT_)DISTANCE would be zero whenever the stylus was in direct contact. It appears that the correct way to determine whether the stylus is in direct contact (rather than hovering) is by checking for a non-zero reported pressure. Added code to read the initial state of tool buttons and axis values when the input devices are initialized or reset. This fixes problems where the input mapper state might have the wrong initial state. Moved responsibility for cancelling pending inputs (keys down, touches, etc.) to the InputDispatcher by sending it a device reset notification. This frees the InputReader from having to synthesize events during reset, which was cumbersome and somewhat brittle to begin with. Consolidated more of the common accumulator logic from SingleTouchInputMapper and MultiTouchInputMapper into TouchInputMapper. Improved the PointerLocation output. Change-Id: I595d3647f7fd7cb1e3eff8b3c76b85043b5fe2f0
* Fix for 4142219 Don't hard code platform-specific limitations (Jni/ Java)Rajneesh Chowdury2011-08-191-1/+25
| | | | | | Also fixes 5118207 add other video codec support for video editor export. Change-Id: If72427173bd8ff684af07ba00f4425c1deef29c6
* Merge "SurfaceTexture: fix queues-to-composer"Jamie Gennis2011-08-181-2/+3
|\
| * SurfaceTexture: fix queues-to-composerJamie Gennis2011-08-171-2/+3
| | | | | | | | | | | | | | | | | | | | | | This change fixes the NATIVE_WINDOW_QUEUES_TO_WINDOW_COMPOSER query of Surface and SurfaceTextureClient. Surface now uses the inherited SurfaceTextureClient implementation of this query. SurfaceTextureClient now queries SurfaceFlinger to determine whether buffers that are queued to its ISurfaceTexture will be sent to SurfaceFlinger (as opposed to some other process). Change-Id: Iff187e72f30d454229f07f896b438198978270a8
* | Merge "Add new camera focus mode FOCUS_MODE_CONTINUOUS_PICTURE."Wu-cheng Li2011-08-171-6/+17
|\ \
| * | Add new camera focus mode FOCUS_MODE_CONTINUOUS_PICTURE.Wu-cheng Li2011-08-181-6/+17
| | | | | | | | | | | | | | | | | | | | | The API is still hidden. bug:5086125 Change-Id: I69268a95ad6aae249771d3a8dfb423ffe2d87081
* | | Merge "don't return the current buffer from dequeueBuffer"Mathias Agopian2011-08-171-1/+1
|\ \ \
| * | | don't return the current buffer from dequeueBufferMathias Agopian2011-08-171-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we were not reseting mCurrentTexture in some situations which in turn caused dequeueBuffers() return a "FREE" buffer that was also current. Very often it was harmless, but it created a race with updateTexImage() which could cause the following queueBuffers() to fail. Bug: 5156325 Change-Id: If15a31dc869117543d220d6e5562c57116cbabdb
* | | am ddf155b8: am 5dcda1fd: am 88512f59: am a8313e71: Merge "Fix String16 ↵Xavier Ducrohet2011-08-171-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | operator+ to actually work" * commit 'ddf155b8338eb894a97612e4cb21257c11d8434a': Fix String16 operator+ to actually work
| * | am 5dcda1fd: am 88512f59: am a8313e71: Merge "Fix String16 operator+ to ↵Xavier Ducrohet2011-08-171-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | actually work" * commit '5dcda1fda53bdc6dfe80cf37e62cacdc216224b1': Fix String16 operator+ to actually work
| | * \ am 88512f59: am a8313e71: Merge "Fix String16 operator+ to actually work"Xavier Ducrohet2011-08-171-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit '88512f59bc051a42f4dd70acc8af5622f7e99db6': Fix String16 operator+ to actually work
| | | * \ am a8313e71: Merge "Fix String16 operator+ to actually work"Xavier Ducrohet2011-08-171-1/+1
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a8313e71fe8b483448d14e22610101c5f3672744': Fix String16 operator+ to actually work
| | | | * | Fix String16 operator+ to actually workJosiah Gaskin2011-08-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change fixes the String16 utility's operator+ function. Change-Id: Ibed7b07277b50bf178febc72b6ce497893e66f17
| | * | | | am b654e6e5: am d144748d: Merge "Add missing include"Jean-Baptiste Queru2011-08-111-0/+2
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit 'b654e6e55a3e8d7e8c2e0b8b1ff4bb4f76c10e05': Add missing include
| | | * | | am d144748d: Merge "Add missing include"Jean-Baptiste Queru2011-08-111-0/+2
| | | |\ \ \ | | | | |/ / | | | | | | | | | | | | | | | | | | * commit 'd144748d4767b2ccfb13857e23f78bc944e9531d': Add missing include
| | | | * | Add missing includeJean-Baptiste Queru2011-08-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I00181029e80a2ba75320550c14e950fadbab8a64
| | * | | | am 44874c23: am c962512c: Merge "added stub for getting buffer from surface ↵Jean-Baptiste Queru2011-08-111-0/+1
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | texture" * commit '44874c236de282b0d898f179fc9fdafa84aae40d': added stub for getting buffer from surface texture
| | | * | | am c962512c: Merge "added stub for getting buffer from surface texture"Jean-Baptiste Queru2011-08-111-0/+1
| | | |\ \ \ | | | | |/ / | | | | | | | | | | | | | | | | | | * commit 'c962512cac19e2bb1103c0c1a5f739d40d4d7740': added stub for getting buffer from surface texture
| | | | * | added stub for getting buffer from surface textureChris Craik2011-08-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If61153cacdd8027848f40f8d9035f7c4aead0a98
| | * | | | am ca97671e: am 6f5a837c: Merge "Fix getSwitchState according to device ↵Jeff Brown2011-08-101-0/+1
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | capabilities." * commit 'ca97671e2b74ed31b5bef6fd0b39e489f1ec5f51': Fix getSwitchState according to device capabilities.
| | | * | | am 6f5a837c: Merge "Fix getSwitchState according to device capabilities."Jeff Brown2011-08-101-0/+1
| | | |\ \ \ | | | | |/ / | | | | | | | | | | | | | | | | | | * commit '6f5a837c9c4a55c82111c6cd5af6055b63fcb5a9': Fix getSwitchState according to device capabilities.
| | | | * | Merge "Fix getSwitchState according to device capabilities."Jeff Brown2011-08-101-0/+1
| | | | |\ \
| | | | | * | Fix getSwitchState according to device capabilities.Michaël Burtin2011-07-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When querying switch state for a given device id, ensure that the device exposes the given switch in its capabilities, report AKEY_STATE_UNKNOWN otherwise. This fix a bug in InputManager that reports an incorrect switch state (down) when a device exposes at least one switch in its capabilites and another switch is queried. For example, this can leads in always reporting LID state open (SW_LID down) if only SW_HEADPHONE_INSERT is exposed in capabilities. Change-Id: I4e5265ec02af918c317673789e7948529842aa2d Signed-off-by: Michaël Burtin <mburtin@gmail.com>
| | * | | | | am 7e79b9aa: am dbff9107: Merge "Support wrapping app processes to inject ↵Jeff Brown2011-08-101-2/+8
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | debug instrumentation. Bug: 4437846" * commit '7e79b9aad85db332d334f8bc1625bf46f030830f': Support wrapping app processes to inject debug instrumentation. Bug: 4437846
| | | * | | | am dbff9107: Merge "Support wrapping app processes to inject debug ↵Jeff Brown2011-08-101-2/+8
| | | |\ \ \ \ | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instrumentation. Bug: 4437846" * commit 'dbff91077ddf437b62794e077d2ce9e10fff8170': Support wrapping app processes to inject debug instrumentation. Bug: 4437846
| | | | * | | Merge "Support wrapping app processes to inject debug instrumentation. Bug: ↵Jeff Brown2011-08-101-2/+8
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4437846"
| | | | | * | | Support wrapping app processes to inject debug instrumentation.Jeff Brown2011-07-281-2/+8
| | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4437846 Change-Id: Ib0559e5224b0fa0df074e485787307b6634e8654
| | * | | | | am 98c531dc: am 9b0c6bee: Merge "Fix a compiling error when trying to use ↵Jean-Baptiste Queru2011-08-021-0/+1
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setBufferCount" * commit '98c531dca9e52af280ca002658bbe38775b3f6ae': Fix a compiling error when trying to use setBufferCount
| | | * | | | am 9b0c6bee: Merge "Fix a compiling error when trying to use setBufferCount"Jean-Baptiste Queru2011-08-021-0/+1
| | | |\ \ \ \ | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | * commit '9b0c6beed2cd5463655712ad80ed160c08611ff8': Fix a compiling error when trying to use setBufferCount
| | | | * | | Fix a compiling error when trying to use setBufferCountTeng-Hui Zhu2011-08-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1aefaf7ec111340a584e0beeeea60b845e16bb1f
| * | | | | | resolved conflicts for merge of b7f09f28 to honeycomb-plus-aospDerek Sollenberger2011-07-291-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | Change-Id: Iebde13c41a2adf4e693d87e808cb0659f913e4e6
| | * | | | | am b7ed8471: am 01caec8c: Merge "Adding an optional param to the ↵Derek Sollenberger2011-07-291-1/+1
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SurfaceTexture constructor." * commit 'b7ed8471f1b96aff901149cf9ac29e4b32672f93': Adding an optional param to the SurfaceTexture constructor.
| | | * | | | am 01caec8c: Merge "Adding an optional param to the SurfaceTexture constructor."Derek Sollenberger2011-07-291-1/+1
| | | |\ \ \ \ | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | * commit '01caec8c4165a6cce2f276f8016b9eadab966944': Adding an optional param to the SurfaceTexture constructor.
| | | | * | | Adding an optional param to the SurfaceTexture constructor.Derek Sollenberger2011-07-291-1/+1
| | | | |/ / | | | | | | | | | | | | | | | | | | Change-Id: I0fdbccf483a16af8039b85c0562f19a34ebce536
| | | | * | DO NOT MERGE. may fix build on some version of gccMathias Agopian2011-07-271-0/+1
| | | |/ / | | | | | | | | | | | | | | | Change-Id: Id99d390862731fd3fbc009dbffdf1d2a59dbe348
| | * | | am 54146a63: Merge "DO NOT MERGE. may fix build on some version of gcc" into ↵Xavier Ducrohet2011-06-281-0/+1
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | gingerbread * commit '54146a634e0e66a5e4732ba1a80079a1e93bdd8a': DO NOT MERGE. may fix build on some version of gcc
| | | * | DO NOT MERGE. may fix build on some version of gccMathias Agopian2011-06-161-0/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Id99d390862731fd3fbc009dbffdf1d2a59dbe348
| | * | | am f458d5fd: Merge "Tweak for forward-compatibility"Jean-Baptiste Queru2011-06-241-0/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f458d5fdb8a48747d6fdd5fd0d0a44a6a8ed89e9': Tweak for forward-compatibility
| | | * | | Tweak for forward-compatibilityJean-Baptiste Queru2011-06-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic5e4d949c1c80a2ebdc2ec802c35b5d3d7f9661d
| | * | | | am e3b05d09: Merge "Tweaks for forward-compatibility"Jean-Baptiste Queru2011-06-203-0/+4
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit 'e3b05d09163257b888c86f2a560e10c48f4cf029': Tweaks for forward-compatibility
| | | * | | Tweaks for forward-compatibilityJean-Baptiste Queru2011-06-183-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iec525edc186e78d5d865f82dd5b1f56263c22e86
| | * | | | am afffa8fa: fix RefBase so it retains binary-compatibility with gingerbread ↵Mathias Agopian2011-06-151-7/+13
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | (DO NOT MERGE) * commit 'afffa8fa9f82a7343e1158bf921931fd3e3df615': fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
| | | * | | fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)Mathias Agopian2011-06-131-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4595257 Change-Id: I4773cf4fe59b2509db0ed733739eb6961d473b25
| * | | | | am 48294b0d: am e7d3ee9d: Revert "merge various SF fixes from gingerbread to ↵Mathias Agopian2011-06-161-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-mr2" (DO NOT MERGE) * commit '48294b0d9388cff632f0e6ae5220305d342c76fb': Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
| | * | | | | Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)Mathias Agopian2011-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also revert all dependent changes: This reverts commit 8e18668d14adf601cbe5973030c310ec23d88461. This reverts commit 69b4587bfbb3e98f793959d9123340360fa233a2. This reverts commit a9c9a4baf24700e8817d47d8ea8da1742caea0b5. This reverts commit 2c0042b666a969091c931614f2fc0dce2f1cfac8. This reverts commit f6c8206735e7e078461e5f2aef6e1a1446fdd075. This reverts commit 24855c09173a6caaec7dcedd0c2d7ce15121d39b. Change-Id: I33e699640f3f59e42fa03c99a9a1b7af0d27d4d8
| * | | | | | am 0887b8c2: am 8e18668d: revert surfaceflinger leak fix as it uncovered a ↵Mathias Agopian2011-06-151-14/+0
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | crasher on xoom (DO NOT MERGE) * commit '0887b8c2e583e682cd2c1bc909cb3fdbec704004': revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)