summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Add an auto-exposure lock feature to the Camera API."Eino-Ville Talvala2011-05-031-0/+20
|\
| * Add an auto-exposure lock feature to the Camera API.Eino-Ville Talvala2011-05-021-0/+20
| | | | | | | | | | | | | | | | | | | | Adds a new camera parameter for locking auto-exposure to its current value. Also adds a function for checking if auto-exposure lock is supported by the current platform. Hidden for now. Change-Id: Id452371191ab220318ce2cb98b8ee91bdde9aab6
* | Merge "remove last traces of copybit"Mathias Agopian2011-05-021-16/+0
|\ \
| * | remove last traces of copybitMathias Agopian2011-05-021-16/+0
| | | | | | | | | | | | Change-Id: Ia0f13a0ee6f702256482b5eb29d7fa2aa840bfc7
* | | Merge "Add setParameter/getParameter to MediaPlayer API. for bug 1982947"Gloria Wang2011-04-293-0/+7
|\ \ \
| * | | Add setParameter/getParameter to MediaPlayer API.Gloria Wang2011-04-293-0/+7
| |/ / | | | | | | | | | | | | | | | for bug 1982947 Change-Id: If3f40e4f18cbba155af29944af38bdc627f8cd53
* | | Add DRM errors in the DRM frameworks to MediaErrors also.Gloria Wang2011-04-292-9/+22
|/ / | | | | | | | | | | For bug 4350156. Change-Id: Ib5711ec642178a49203a448b7f5114e675d49394
* | get rid of dependency on copybit HAL moduleMathias Agopian2011-04-282-25/+0
|/ | | | Change-Id: Ia608099a2426c11a91d33063ba53c93e1eccb428
* Merge changes I22d9e018,Ib0701fcc,Ibc637918,I9eb7e002,I4adcec73Dima Zavin2011-04-2710-362/+141
|\ | | | | | | | | | | | | | | | | * changes: audioflinger: don't do work in constructor, instead do it in onFirstRef audioflinger: enumerate all the possible audio interfaces audio/media: convert to using the audio HAL and new audio defs libmedia: move AudioParameter out of AudioSystem audioflinger: move legacy audio hw/policy out to libhardware_legacy
| * audio/media: convert to using the audio HAL and new audio defsDima Zavin2011-04-2710-322/+70
| | | | | | | | | | Change-Id: Ibc637918637329e4f2b62f4ac7781102fbc269f5 Signed-off-by: Dima Zavin <dima@android.com>
| * libmedia: move AudioParameter out of AudioSystemDima Zavin2011-04-272-44/+75
| | | | | | | | | | Change-Id: I9eb7e002d141936258050d4fa4f0ccd8202bfc54 Signed-off-by: Dima Zavin <dima@android.com>
* | am d84df054: am 96974931: am 83ddcdf7: Add heartbeat error codes into ↵Gloria Wang2011-04-271-0/+11
|\ \ | |/ |/| | | | | | | | | MediaErrors.h * commit 'd84df05490e8b102e81cca848f65c174398be1b6': Add heartbeat error codes into MediaErrors.h
| * am 96974931: am 83ddcdf7: Add heartbeat error codes into MediaErrors.hGloria Wang2011-04-271-0/+11
| |\ | | | | | | | | | | | | * commit '969749319ca17f6e0c6836303a78cc484df2539b': Add heartbeat error codes into MediaErrors.h
| | * Add heartbeat error codes into MediaErrors.hGloria Wang2011-04-261-0/+11
| | | | | | | | | | | | | | | | | | related-to-bug: 4322415 Change-Id: I78137c61e3a8ce9afcb9fb38cb77a83561b9b72d
* | | fix typo in Vector<>:: push_back and push_frontMathias Agopian2011-04-251-2/+2
| | | | | | | | | | | | | | | | | | parameter were inverted. Change-Id: I867b01de5f58354bb9668fa662dd2a7d78dd3b37
* | | Merge "Add some basic STL compatibility to Vector<>"Mathias Agopian2011-04-251-0/+20
|\ \ \
| * | | Add some basic STL compatibility to Vector<>Mathias Agopian2011-04-251-0/+20
| | | | | | | | | | | | | | | | Change-Id: Iaf72623170ee415372c7989d7ba9ff627167449e
* | | | Merge "MediaScanner: reimplement the ".nomedia" feature for hiding files ↵Mike Lockwood2011-04-251-3/+2
|\ \ \ \ | | | | | | | | | | | | | | | from the media provider"
| * | | | MediaScanner: reimplement the ".nomedia" feature for hiding files from the ↵Mike Lockwood2011-04-251-3/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | media provider Previously we ignored any files and directories that had name started with '.' and ignored any directories that contained a ".nomedia" file. Now to support transferring any file via MTP, we now add these previously ignored files to the media database, but will not mark them as audio, video, image or playlist files. That way they will be included in the files table but will be hidden from the audio, video, images and playlist views that are used by apps like Music and Gallery. Bug: 3405327 Change-Id: I2d7285bd32e06c1a5c4ef6a8a15f8f8b2c33b39b Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | Merge "Clarify the meaning of weight in the focus and metering area HAL."Eino-Ville Talvala2011-04-251-9/+12
|\ \ \ \ | |/ / / |/| | |
| * | | Clarify the meaning of weight in the focus and metering area HAL.Eino-Ville Talvala2011-04-251-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Weigh values must be less than 1000, but have no restriction on their sum. Weights should be interpreted as per-pixel values, meaning larger areas will have more influence over focus/metering than smaller areas of the same weight. Change-Id: I988b74f988ddba2ff0c49d078ff3174b47cbae18
* | | | Get rid of the "pid" parameter from createSurfaceMathias Agopian2011-04-202-3/+0
| | | | | | | | | | | | | | | | Change-Id: I28635e3f803e6abe965d79998e305f54a202465d
* | | | Merge "Initial checkin of spot presentation for touchpad gestures."Jeff Brown2011-04-191-0/+5
|\ \ \ \
| * | | | Initial checkin of spot presentation for touchpad gestures.Jeff Brown2011-04-191-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a new PointerIcon API (hidden for now) for loading pointer icons. Fixed a starvation problem in the native Looper's sendMessage implementation which caused new messages to be posted ahead of old messages sent with sendMessageDelayed. Redesigned the touch pad gestures to be defined in terms of more fluid finger / spot movements. The objective is to reinforce the natural mapping between fingers and spots which means there must not be any discontinuities in spot motion relative to the fingers. Removed the SpotController stub and folded its responsibilities into PointerController. Change-Id: I5126b1e69d95252fda7f2a684c9287e239a57163
* | | | | Merge "changes to SurfaceTexture needed for unification with SF"Mathias Agopian2011-04-182-3/+44
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | changes to SurfaceTexture needed for unification with SFMathias Agopian2011-04-112-3/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - implement connect/disconnect - implement missing query - handle texture_2d in addition to texture_external_oes Change-Id: I971a70821f00f22b01f5337de4a7d451177fec4d
* | | | | Merge "Parcel::appendFrom({const } Parcel *parcel, size_t, size_t)"Andreas Huber2011-04-181-1/+2
|\ \ \ \ \
| * | | | | Parcel::appendFrom({const } Parcel *parcel, size_t, size_t)Andreas Huber2011-04-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As far as I can tell "parcel" isn't actually modified by the implementation. Change-Id: Ib806eefdc13c97b932773e1dc9ca3a4aad4422b2
* | | | | | Merge "Fix a GraphicBuffer leak in SurfaceTexture"Mathias Agopian2011-04-152-15/+1
|\ \ \ \ \ \
| * | | | | | Fix a GraphicBuffer leak in SurfaceTextureMathias Agopian2011-04-082-15/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This leak was intentional, it was there to deal with the fact that some gralloc implementations don't track buffer handles with file-descriptors so buffers needed to stay alive until there were registered, which is not guaranteed by binder transactions. In this new implementation, we use a small BBinder holding a reference to the buffer, which with tuck into the parcel. This forces the reference to stay alive until the parcel is destroyed, which is guaranteed (by construction) to happen after the buffer is registered. this allows the public facing API to not expose the previous hack. Change-Id: I1dd6cd83679a2b7457ad628169e2851acc027143
* | | | | | Add Java API for writing TTS enginesBjorn Bringert2011-04-151-232/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the old non-public C++ API for TTS engines and replaces it with a Java API. The new API is still @hidden, until it has been approved. Bug: 4148636 Change-Id: I7614ff788e11f897e87052f684f1b4938d539fb7
* | | | | | Replace a custom AndroidRuntime::findClass with a more targeted fix.Elliott Hughes2011-04-131-6/+12
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This seems simpler and more contained, and I think the comment explaining why hoop-jumping is necessary is a bit clearer now. Change-Id: Ief4afd7cbb42188ed835fce23e497520bdb753a8
* | | | | Merge "- Add another parameter in notify() to be able to send timed text ↵Gloria Wang2011-04-133-6/+9
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | sample through listener during video playback. - Add OnTimedTextListener in the MediaPlayer For feature request 800939."
| * | | | - Add another parameter in notify() to be able to send timed text sampleGloria Wang2011-04-133-6/+9
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | through listener during video playback. - Add OnTimedTextListener in the MediaPlayer For feature request 800939. Change-Id: I65072c27acb4c0037109a72be38c73e9f667420f
* | | | Merge "Add camera metering area API."Wu-cheng Li2011-04-131-0/+38
|\ \ \ \
| * | | | Add camera metering area API.Wu-cheng Li2011-04-131-0/+38
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | The API are still hidden. bug:3475893 Change-Id: Id4147528def5e0fe067e1a3ed315fa34c14a0640
* | | | resolved conflicts for merge of 18490fb9 to masterKenny Root2011-04-122-4/+33
|\ \ \ \ | | |/ / | |/| | | | | | Change-Id: I6c68e6fb0f9c1182a955689bbffc161a8f30bd37
| * | | resolved conflicts for merge of 87b3c0dc to honeycomb-plus-aospKenny Root2011-04-122-4/+33
| |\ \ \ | | |_|/ | |/| | | | | | Change-Id: Ia1a0024aabf531438203eb9fea3a10dd15eabe53
| | * | am 08d9d9a4: Merge "Runtime resource overlay, iteration 1."Kenny Root2011-04-112-4/+33
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit '08d9d9a46250c4fad66e9b637e8898a3524c4286': Runtime resource overlay, iteration 1.
| | | * | Runtime resource overlay, iteration 1.Mårten Kongstad2011-04-012-4/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Runtime resource overlay allows unmodified applications to appear as if they had been compiled with additional resources defined. See libs/utils/README for more information. This commit is the first iteration of runtime resource overlay. It provides the actual overlay modifications and loading of trusted overlay packages (ie residing in /vendor) targeting framework-res.apk. This commit loads exactly one overlay package. The overlay, if present, must target framework-res.apk and be located at /vendor/overlay/framework/framework-res.apk. Change-Id: If26ee7754813004a96c043dba37fbe99fa3919db
| | * | | 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
| | | |\ \ \