summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* am c6b22e27: Updated JBQ\'s original SurfaceTexture stubs to make webkit MR1 ↵Russell Brenner2011-03-311-0/+6
|\ | | | | | | | | | | | | buildable * commit 'c6b22e2727bd3730edd5ad72831a9bb4670d00f3': Updated JBQ's original SurfaceTexture stubs to make webkit MR1 buildable
| * Updated JBQ's original SurfaceTexture stubs to make webkit MR1 buildableRussell Brenner2011-03-311-0/+6
| | | | | | | | Change-Id: If1c1610efcc0e0bc6de88c75712baed91624b1a7
* | am 49b49f8f: Added include/private/hwui/DrawGlInfo.hRussell Brenner2011-03-311-0/+50
|\ \ | |/ | | | | | | * commit '49b49f8fb6d094768d4e093353b34271f2da1bfc': Added include/private/hwui/DrawGlInfo.h
| * Added include/private/hwui/DrawGlInfo.hRussell Brenner2011-03-311-0/+50
| | | | | | | | Change-Id: If50ccabb8761a994fa1f7aef4fbdb668c6160b0c
* | am df6410dc: Merge "Fix [3513017] in lockscreen but showing empty launcher ↵Mathias Agopian2011-03-071-14/+48
|\ \ | |/ |/| | | | | | | | | (live wallpaper) only" into gingerbread * commit 'df6410dce3dae0bdb7e13118b3878079a1dcce03': Fix [3513017] in lockscreen but showing empty launcher (live wallpaper) only
| * Fix [3513017] in lockscreen but showing empty launcher (live wallpaper) onlyMathias Agopian2011-03-071-14/+48
| | | | | | | | | | | | | | | | | | | | | | 37c2a37 fix [3408713] Dialog window invisible sometimes d35c666 fix [3385504] Surface flinger hang when adding dim surface 1723b04 fix [3389263] OMX.Nvidia.h264.decode fails to shutdown 1b0114f fix a surface leak in SurfaceFlinger Bug: 3513017 Change-Id: Ia13ed8c9cdcb1f484e177cdcaff687e7c88a10c3
* | am 93552de8: Merge "stubs"Jean-Baptiste Queru2011-02-111-0/+4
|\ \ | | | | | | | | | | | | * commit '93552de8e305027fb003401e347b9493c64c981f': stubs
| * | stubsSteve Block2011-02-111-0/+4
| | | | | | | | | | | | Change-Id: I6bc0b8e9d4412a0b60c6226fbd2b7a6d15aceb22
* | | am a6fb375c: am 056340ac: Merge "stubs"Jean-Baptiste Queru2011-01-313-0/+88
|\ \ \ | |/ / | | | | | | | | | * commit 'a6fb375cf727b6ded057110875fe49a9b3f230a3': stubs
| * | Merge "stubs"Jean-Baptiste Queru2011-01-313-0/+88
| |\ \
| | * | stubsJean-Baptiste Queru2011-01-293-0/+88
| | | | | | | | | | | | | | | | Change-Id: I829039f3817a172e66eeb9df397e896a488a259d
* | | | am a30063d8: am 25eb0464: Merge "Normalize output from aapt d"Dianne Hackborn2011-01-291-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'a30063d80c08434ac3c7316f338c6d54110449ab': Normalize output from aapt d
| * | | Merge "Normalize output from aapt d"Dianne Hackborn2011-01-291-0/+1
| |\ \ \ | | |/ / | |/| |
| | * | Normalize output from aapt dShachar Shemesh2011-01-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the output from aapt dump --values resources and aapt dump xmltree normalized, so that it is unambigously displayed regardless of the content of the strings. Change-Id: Ia3bff36c4ee1e9a44f474534e154830948beabdf
* | | | am 2ba92c71: do not merge bug 3370834 Cherrypick from masterJean-Michel Trivi2011-01-263-5/+10
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | * commit '2ba92c71b5684dce700cf848bf157153c156df1d': do not merge bug 3370834 Cherrypick from master
| * | | do not merge bug 3370834 Cherrypick from masterJean-Michel Trivi2011-01-263-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherripick from master CL 79833, 79417, 78864, 80332, 87500 Add new audio mode and recording source for audio communications other than telelphony. The audio mode MODE_IN_CALL signals the system the device a phone call is currently underway. There was no way for audio video chat or VoIP applications to signal a call is underway, but not using the telephony resources. This change introduces a new mode to address this. Changes in other parts of the system (java and native) are required to take this new mode into account. The generic AudioPolicyManager is updated to not use its phone state variable directly, but to use two new convenience methods, isInCall() and isStateInCall(int) instead. Add a recording source used to designate a recording stream for voice communications such as VoIP. Update the platform-independent audio policy manager to pass the nature of the audio recording source to the audio policy client interface through the AudioPolicyClientInterface::setParameters() method. SIP calls should set the audio mode to MODE_IN_COMMUNICATION, Audio mode MODE_IN_CALL is reserved for telephony. SIP: Enable built-in echo canceler if available. 1. Always initialize AudioRecord with VOICE_COMMUNICATION. 2. If echo canceler is available, disable our echo suppressor. Note that this CL is intentionally not correcting the getAudioSourceMax() return value in MediaRecorder.java as the new source is hidden here. Change-Id: Ie68cd03c50553101aa2ad838fe9459b2cf151bc8
* | | | am 239fd805: Merge "fix [3361121] hang in glClear() - device unresponsive, ↵Mathias Agopian2011-01-251-7/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | OTA fails (DO NOT MERGE)" into gingerbread * commit '239fd805ef7c0e4116b0a89e20caaf287e91f017': fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)
| * | | fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)Mathias Agopian2011-01-251-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generally we never want to lock a buffer for write access if it is at the "head" on the surfaceflinger side. The only exception (1) is when the buffer is not currently in use AND there is at least one queued buffer -- in which case, SurfaceFlinger will never use said buffer anymore, because on the next composition around, it will be able to retire the first queued buffer. The logic above relies on SurfaceFlinger always retiring and locking a buffer before composition -- unfortunately this didn't happen during a screenshot. This could leave us in a situation where a buffer is locked by the application for write, and used by SurfaceFlinger for texturing, causing a hang. Here, we fix this issue by never assuming the exception (1), it was intended as an optimization allowing ANativeWindow::lockBuffer() to return sooner and was justified when most of SF composition was done in software. The actual buffer locking is now ensured by gralloc. We could have handled screenshots in a similar way to a regular composition, but it could have caused glitches on screen, essentially, taking a screenshot could cause to skip a frame. now that we removed the notion of a "inUse" buffer in surfaceflinger a lot of code can be simplified / removed. noteworthy, the whole concept of "unlockClient" wrt. "compositionComplete" is also gone.
* | | | am d3fcd0a1: Merge "minor clean-up. SurfaceFlinger doesn\'t need ↵Mathias Agopian2011-01-251-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | libpixelflinger.so. (DO NOT MERGE)" into gingerbread * commit 'd3fcd0a1c923498921107bb44fbc8b24582a170a': minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so. (DO NOT MERGE)
| * | | minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so. (DO NOT MERGE)Mathias Agopian2011-01-251-1/+1
| | | | | | | | | | | | | | | | Change-Id: I1ddbbbec4fa5b2521ef3787bc28efe1bc90d0060
* | | | am 265cf2e7: Merge "Fix getSwitchState."Jeff Brown2011-01-221-0/+9
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '265cf2e76bef9ee369a7d43d567a22a0c39355ef': Fix getSwitchState.
| * | | Fix getSwitchState.Jeff Brown2011-01-191-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | InputReader::getSwitchState always returns AKEY_STATE_UNKNOWN because SwitchInputMapper::getSources() returns 0 which cannot match any source mask including AINPUT_SOURCE_ANY. As a result initial lid switch detection is broken. This change adds a new source constant AINPUT_SOURCE_SWITCH that indicates that the source has switches. Change-Id: I5321ecf0ce84f1c2b4535f6c163d3f4dcf9b7a9b
* | | | am 41395459: Merge "Filter virtual keys after touches. (DO NOT MERGE)" into ↵Jeff Brown2011-01-181-0/+17
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | gingerbread * commit '41395459e676cf9ab4059e08446656f145662c2d': Filter virtual keys after touches. (DO NOT MERGE)
| * | | Merge "Filter virtual keys after touches. (DO NOT MERGE)" into gingerbreadJeff Brown2011-01-181-0/+17
| |\ \ \
| | * | | Filter virtual keys after touches. (DO NOT MERGE)Jeff Brown2011-01-111-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a new virtualKeyQuietTimeMillis configuration resource that sets the duration for which virtual keys will be dropped after recent touches on screen. The default value is 0; it is intended to be overridden per device using a resource overlay. This change is designed to help in two cases: 1. Swipes from touchscreen into virtual key area. 2. Accidental taps in virtual key area while using on-screen keyboard. Bug: 3089163 Change-Id: Id6733c83c2e2bc8d9553aa0e5c1fd74b741bec6e
* | | | | merge 83fdc69e from gingerbread - do not mergeJean-Baptiste Queru2011-01-143-62/+10
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Change-Id: Ib1e9e12244a44f75a93d66142e71915de6386680
| * | | | Squash commits of the following patches, cherry-picked from other branch - ↵James Dong2011-01-123-62/+10
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | do not merge. o Prepare for publishing MediaMetadataRetriever as public API step one: o replaced captureFrame with getFrameAtTime o removed getMode o Replace MediaMetadataRetriever.captureFrame() with MediaMetadataRetriever.getFrameAtTime() as part of the preparation for publishing MediaMetadataRetriever as public Java API o Remove captureFrame from MediaMetadataRetriever.java class It has been replaced by getFrameAtTime() method o Replace extractAlbumArt() with getEmbeddedPicture() in MediaMetadataRetriever.java o Publish MediaMetadataRetriever.java as public API o Removed setMode() methods and related mode constants o Removed some of the unused the metadata keys o Updated the javadoc o part of a multi-project change. bug - 3309041 Change-Id: I2efb6e8b8d52897186b016cb4efda6862f5584c4
* | | | am 13d1cb56: Merge "Avoid deadlock in OMX::freeNode by making sure ↵James Dong2011-01-101-2/+7
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge" into gingerbread * commit '13d1cb56dfdfc89888de6a0389b0fe6cf7e36c27': Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge
| * | | Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not ↵James Dong2011-01-101-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hold the last reference of OMXCodec object - do not merge cherry-picked from: I4c79b66a900c527e3ae6a833f76d5da1b75c5a89 bug - 3336424 Change-Id: I2d8ecb79a5422342988c195c012c9e6327ac457a
* | | | am 0544d059: Merge "DRM Framework bug fixes."Gloria Wang2011-01-071-0/+3
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '0544d05990c0f43a143e98e71f7fc60277872806': DRM Framework bug fixes.
| * | | Merge "DRM Framework bug fixes."Gloria Wang2011-01-071-0/+3
| |\ \ \ | | |_|/ | |/| |
| | * | DRM Framework bug fixes.Takeshi Aimi2010-11-301-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Make sure to clean-up obsolete listeners. - Close cursor after using it. - Add virtual destructor to the base class of OnInfoListener. Changes are made by SEMC and Sony. Change-Id: Ibb6dd625ef48e3597188f0d7c90f9d4c780b6139
* | | | am ba77a3f9: Add support for the "compilation" tag in mp3, mp4 and ogg, and ↵Marco Nelissen2011-01-062-0/+2
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | also add support for two common ways of specifying album artist in ogg files. b/3311831 * commit 'ba77a3f9cb1d68b2ed4813aaae856444578e3a75': Add support for the "compilation" tag in mp3, mp4 and ogg, and also add support for two common ways of specifying album artist in ogg files. b/3311831
| * | | Add support for the "compilation" tag in mp3, mp4 and ogg, and also addMarco Nelissen2011-01-062-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | support for two common ways of specifying album artist in ogg files. b/3311831 Change-Id: Iba1152013b7577168af71f947d7249560419fa05
* | | | am 35e8dcb9: Merge "Suppress the recording sound in the recorded video" into ↵James Dong2011-01-051-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | gingerbread * commit '35e8dcb9df8c3d77ede120e3f1aaf842b2928639': Suppress the recording sound in the recorded video
| * | | Suppress the recording sound in the recorded videoJames Dong2011-01-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | bug - 3309194 Change-Id: Ib8fb248943bc22f963d67537bfdbc6056c5a159b
* | | | am a2977c38: Merge changes Ie03796ae,Ide3e980a into gingerbreadMathias Agopian2010-12-072-2/+16
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * commit 'a2977c383d363e1e88a5b36230b1fa4c312807d2': [3171580] SurfaceFlinger Bypass mode. (DO NOT MERGE) [3171580] Add transform field to native buffers. (DO NOT MERGE)
| * | | [3171580] Add transform field to native buffers. (DO NOT MERGE)Mathias Agopian2010-12-032-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This field indicate how the content of the buffer needs to be transformed. Change-Id: Ide3e980a90599e931406135693231276626adbbb
* | | | am 4153bf3a: Merge "[3171580] don\'t automatically log GraphicBuffer ↵Mathias Agopian2010-12-072-1/+5
|\ \ \ \ | |/ / / | | / / | |/ / |/| | | | | | | | allocation failures" into gingerbread * commit '4153bf3a259624a2f2dc497b77b225a1fb517abc': [3171580] don't automatically log GraphicBuffer allocation failures
| * | [3171580] don't automatically log GraphicBuffer allocation failuresMathias Agopian2010-12-032-1/+5
| | | | | | | | | | | | | | | | | | | | | some of these failures are not fatal and even expected in some cases so they should not emit a dump in the log in those cases. Change-Id: Idcfa252e3bfa9d74e27fe4ad8f8623aa01aa9c5e
* | | am d9334934: Merge "Update of DRM Framework."Gloria Wang2010-11-222-0/+123
|\ \ \ | | |/ | |/| | | | | | | * commit 'd93349342a89a25c7a884e8543c6adc048c5f86d': Update of DRM Framework.
| * | Update of DRM Framework.Takeshi Aimi2010-11-192-0/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Access permission handling Introduce an internal function which allows the desired process to access decryption flow. This new function is just for reference and each OEM manufacturer should implement/replace with their solutions. -New API, getMetadata() This API is for retrieving media metadata from container-based DRM, such as OMA forward-lock content. This API asks DRM agent to retrieve media metadata hiddein inside of DRM special container. -New API, acquireRights() This API wraps acquireDrmInfo() and processDrmInfo(). If DRM agent has valid implementation of both APIs, Application can acquire DrmRights only by calling this API. -Bug fix in event loop of OnInfoListener. Separate OnInfo event loop from mail thread loop so as to avoid the issue that message is not dispatched when mail thread is busy. Changes are made by SEMC and Sony. Change-Id: I04ee3e0988152a71e221f2256d83253749a29da0
* | | am 589e8381: Merge "Improve camera documentation." into gingerbreadWu-cheng Li2010-11-193-17/+28
|\ \ \ | | |/ | |/| | | | | | | * commit '589e838116b0dffa696fa39336d0588124877f98': Improve camera documentation.
| * | Improve camera documentation.Wu-cheng Li2010-11-193-17/+28
| | | | | | | | | | | | | | | bug:3212606 Change-Id: Iee7106e4665c08a4c75471114010b75d63ac74ce
* | | am a15e4886: Merge "Framebuffer: Support variable number of framebuffers in ↵Jean-Baptiste Queru2010-11-171-1/+2
|\ \ \ | | |/ | |/| | | | | | | | | | | | | the UI" * commit 'a15e4886de8f75f3cb137f51743d330414c910e8': Framebuffer: Support variable number of framebuffers in the UI
| * | Framebuffer: Support variable number of framebuffers in the UIRodrigo Obregon2010-11-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change defines a macro NUM_FRAME_BUFFERS to set the desired number of framebuffers to be used by the UI, instead of hard-coding 2 framebuffers. Aditional logic has been added to handle the initialization and destruction of NUM_FRAME_BUFFERS buffers. Change-Id: I3a4bfec3e0f453432f2ffebf084c00f574d3be46 Signed-off-by: Rodrigo Obregon <robregon@ti.com>
* | | am d2d62d04: Merge "Support extracting thumbnail from rotated video tracks" ↵James Dong2010-11-081-0/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | into gingerbread * commit 'd2d62d04fc387e2f51d414e101a3e8e3c45f415e': Support extracting thumbnail from rotated video tracks
| * | Support extracting thumbnail from rotated video tracksJames Dong2010-11-081-0/+1
| | | | | | | | | | | | Change-Id: Ife0a2536aaac5ff1efdf1035b9d2c892773ee16c
* | | resolved conflicts for merge of 31dc911a to gingerbread-plus-aospAndreas Huber2010-11-083-3/+15
|\ \ \ | |/ / | | | | | | Change-Id: I2f51b2120b3c552566d91a7dc498a5e8b130205f
| * | Support post-decode video rotation.Andreas Huber2010-11-053-3/+15
| | | | | | | | | | | | Change-Id: Ia371316e73a57e44610de86adce3eaa560afbf84
generated by cgit v1.1 at 2024-12-26 19:31:30 +0000