summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* am fb623263: DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature ↵Mike Lockwood2011-05-041-3/+2
|\ | | | | | | | | | | | | for hiding files from the media provider * commit 'fb6232635d339c83ca100e472b159f103dafb6e2': DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider
| * DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding ↵Mike Lockwood2011-05-041-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | files from the 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: Ib707f329be98878501952b6054998518a6eabbbd Signed-off-by: Mike Lockwood <lockwood@android.com>
* | 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
* | 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
| | |\ \
| | | * | stubsJean-Baptiste Queru2011-01-293-0/+88
| | | | | | | | | | | | | | | | | | | | Change-Id: I829039f3817a172e66eeb9df397e896a488a259d
* | | | | Fix for bug 4126624.Gloria Wang2011-03-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the mDrmManagerClientImpl to sp to avoid double delete the pointer. Change-Id: I7aacea1bc58ab6425ef6f6f09472c6f2970ebb4d
* | | | | Add one more field in DecryptHandle to support bug 4126624Gloria Wang2011-03-211-0/+6
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic7ea5fd211c4f8283de8fdf722f89b6a94e5750b
* | | | | do not merge: Cherry pick change I6529695c from master to partially fix bug ↵Gloria Wang2011-03-211-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4126624. Change-Id: If724de60bd6da1becdffc815d5358ffe78629469
* | | | | DO NOT MERGE Send WebView the current transform and whether we're drawing a ↵Romain Guy2011-03-181-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | layer. Bug #3275491 These can be used by WebView to correctly apply alpha and geometric transforms. Change-Id: I61057997f5fda1e803d247fc77500a038d5f3aab
* | | | | Fix missing AOSP copyright headers for a bunch of media framework filesJames Dong2011-03-174-0/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug - 4119349 Change-Id: If5924e16a5f596d5d73d9beb66eaf5ac9a6f0e50
* | | | | fix [4093196] Device lock up - log spam with SharedBufferStack: ↵Mathias Agopian2011-03-171-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | waitForCondition(LockCondition) timed out a memory corruption happned when the buffer pool was resized (like when playing a video or using camera) and there was no current active buffer. In this case, the faulty code would index into an array at position -1 which corrupted 24 bytes of data. also improved region validation code (ifdef'ed out by default) Bug: 4093196 Change-Id: I915c581d131148959d720e00e3892e9186ab733d
* | | | | Modify the GL renderer's functor to pass the clip to WebViewRomain Guy2011-03-161-2/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: If5efe399ca58f3000b2883e24e9f3736a2025184
* | | | | Merge "Bug 4016329 do full string comparisons" into honeycomb-mr1Glenn Kasten2011-03-151-2/+2
|\ \ \ \ \
| * | | | | Bug 4016329 do full string comparisonsGlenn Kasten2011-03-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use full string comparisons instead of partial for file extension and MIME type. Do case-insensitive comparison of MIME type and file extensions. Fix error in comment for String8::getPathExtension. Remove dead code -- StringTokenizer is unused. Change-Id: I322be6235abbdaab5f7eafa48926dbb2cf46dc29
* | | | | | SurfaceTextureClient: Add ISurfaceTexture getter.Jamie Gennis2011-03-141-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds a getter method to SurfaceTextureClient to get the ISurfaceTexture object with which the SurfaceTextureClient is communicating. Bug: 4086509 Change-Id: Ifec621e0fe5392a5be56b2348fdc54067cbebcdd
* | | | | | ANativeWindow: add query for the concrete type.Jamie Gennis2011-03-141-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds a query to the ANativeWindow interface for getting the concrete type of the ANativeWindow. Bug: 4086509 Change-Id: I64aa86d72fbca3b52a98e1fc35608737781a3178
* | | | | | For issue 4082089Gloria Wang2011-03-141-0/+7
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Add more info and error events into the DRM framework Change-Id: I0bb3251c5947fc8e977d478e1ba46b242cb97e9d
* | | | | Merge "- Some change on the DrmManager in order to support feature request ↵Gloria Wang2011-03-141-1/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | 4082089. In DrmManager, we currently lock both processDrmInfo() and onInfo() which is ok for now since processDrmInfo() is async call, and it will return without waiting for onInfo() call. However, if we send an event in processDrmInfo(), we will got deadlock here because we need to invoke onInf() which will wait for processDrmInfo() to release the lock. Use different lock for onInfo(). - Remove some redundent mutex lock." into honeycomb-mr1
| * | | | | - Some change on the DrmManager in order to support feature request 4082089.Gloria Wang2011-03-111-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In DrmManager, we currently lock both processDrmInfo() and onInfo() which is ok for now since processDrmInfo() is async call, and it will return without waiting for onInfo() call. However, if we send an event in processDrmInfo(), we will got deadlock here because we need to invoke onInf() which will wait for processDrmInfo() to release the lock. Use different lock for onInfo(). - Remove some redundent mutex lock. Change-Id: I59c794f95ba1693425723224114fa975cf9b235f
* | | | | | Merge "Bug 3515073 Add ANativeWindow_fromSurfaceTexture" into honeycomb-mr1Glenn Kasten2011-03-111-0/+31
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Bug 3515073 Add ANativeWindow_fromSurfaceTextureGlenn Kasten2011-03-041-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is similar to ANativeWindow_fromSurface. Change-Id: Iaadc06a5d0d50685c34876aa89488c16e7cfaa65
* | | | | | Bug 3012968 DRM output controlGlenn Kasten2011-03-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modifies Stagefright to verify that there is a hardware-protected path to video sink for DRM content. Change-Id: I18b8741390e803a05a88c7f180b860a24ba88a10
* | | | | | Input improvements and bug fixes.Jeff Brown2011-03-091-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Associate each motion axis with the source from which it comes. It is possible for multiple sources of the same device to define the same axis. This fixes new API that was introduced in MR1. (Bug: 4066146) Fixed a bug that might cause a segfault when using a trackball. Only fade out the mouse pointer when touching the touch screen, ignore other touch pads. Changed the plural "sources" to "source" in several places in the InputReader where we intend to refer to a particular source rather than to a combination of sources. Improved the batching code to support batching events from different sources of the same device in parallel. (Bug: 3391564) Change-Id: I0189e18e464338f126f7bf94370b928e1b1695f2
* | | | | | Merge "ANativeWindow: add queues-to-window-composer check." into honeycomb-mr1Jamie Gennis2011-03-092-1/+21
|\ \ \ \ \ \
| * | | | | | ANativeWindow: add queues-to-window-composer check.Jamie Gennis2011-03-082-1/+21
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds a new 'method' to the ANativeWindow interface to check whether buffers queued to the window will be sent directly to the system window compositor. Change-Id: I4d4b199e328c110b68b250029aea650f03c8724d Bug: 3495535
* | | | | | Fix issue 3439872: video chat and bluetooth SCOEric Laurent2011-03-083-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change fixes the stability problems experienced when using a bluetooth headset supporting both A2DP and SCO. Problems occur when starting the video chat at which time the A2DP output is being stopped to start SCO. At that time, active AudioTracks are invalidated by AudioFlinger so that a new AudioTrack binder interface can be recreated by the client process on the new mixer thread with correct parameters. The problem was that the process to restore the binder interface was not protected against concurrent requests which caused 2 binder interfaces to be created sometimes. This could lead to permanent client deadlock if one of the client threads was waiting for a condition of the first created binder interface while the second one was created (as the AudioFlinger would only signal conditions on the last one created). This concurrent request situation is more likely to happen when a client uses the JAVA AudioTrack as the JNI implementation uses simultaneously the native AudioTrack callback and write push mechanisms. By doing so, the code that checks if the binder interface should be restored (in obtainBuffer()) is much more likely to be called concurrently from two different threads. The fix consists in protecting the critical binder interface restore phase with a flag in the AudioTrack control block. The first thread acting upon the binder interface restore request will raise the flag and the second thread will just wait for a condition to be signaled when the restore process is complete. Also protected all accesses to the AudioTrack control block by a mutex to prevent access while the track is being destroyed and restored. If a mutex cannot be held (e.g because we call a callback function), acquire a strong reference on the IAudioTrack to prevent its destruction while the cblk is being accessed. Modified AudioTrack JNI to use GetByteArrayElements() instead of GetPrimitiveArrayCritical() when writing audio buffers. Entering a critical section would cause the JNI to abort if a mediaserver crash occurs during a write due to the AudioSystem callback being called during the critical section when media server process restarts. Anyway with current JNI implementation, either versions do not copy data most of the times and the criticial version does not guaranty no data copy. The same modifications have been made to AudioRecord. Change-Id: Idc5aa711a04c3eee180cdd03f44fe17f3c4dcb52
* | | | | | Merge "Add support for partial invalidates in WebView Bug #3461349" into ↵Romain Guy2011-03-071-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | honeycomb-mr1
| * | | | | | Add support for partial invalidates in WebViewRomain Guy2011-03-071-0/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #3461349 This change also fixes two bugs that prevented partial invalidates from working with other views. Both bugs were in our EGL implementation: they were preventing the caller from comparing the current context/surface with another context/surface. This was causing HardwareRenderer to always redraw the entire screen. Change-Id: I33e096b304d4a0b7e6c8f92930f71d2ece9bebf5
* | | | | | Joystick tweaks. (DO NOT MERGE)Jeff Brown2011-03-042-2/+37
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that the joystick can always reach -1.0, 0.0 and 1.0 positions even when noise filtering is applied. (Bug: 3514510) Add support for a few more standard axes. Add additional mapping modes for axes. Some axes are inverted from standard interpretation or are actually intended to be split into two distict axes such as left/right trigger controls or accelerator/brake. Add key layout file for a G25 racing wheel and XBox 360 controller to tweak behavior. They work fine without them but the axis mappings are not ideal. Change-Id: I0fddd90309af4dc14d35f34fe99ed6e521c0b7c7
* | | | | Merge "Wake screen from external HID peripherals."Jeff Brown2011-03-021-0/+5
|\ \ \ \ \
| * | | | | Wake screen from external HID peripherals.Jeff Brown2011-03-021-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added some plumbing to enable the policy to intercept motion events when the screen is off to handle wakeup if needed. Added a basic concept of an external device to limit the scope of the wakeup policy to external devices only. The wakeup policy for internal devices should be based on explicit rules such as policy flags in key layout files. Moved isTouchEvent to native. Ensure the dispatcher sends the right event type to userActivity for non-touch pointer events like HOVER_MOVE and SCROLL. Bug: 3193114 Change-Id: I15dbd48a16810dfaf226ff7ad117d46908ca4f86
* | | | | | Merge "- To track the usage of all audio output devices - To track the ↵Gloria Wang2011-03-021-5/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | currently used audio device - The devices are separated as speaker and other audio devices - Provide the collected data to battery application through pullBatteryData()"
| * | | | | | - To track the usage of all audio output devicesGloria Wang2011-03-021-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - To track the currently used audio device - The devices are separated as speaker and other audio devices - Provide the collected data to battery application through pullBatteryData() Change-Id: I374c755266b5ac6b1c6c630400f4daf901ea8acc
* | | | | | | Merge "Allow optional specification of a PTS timestamp when signalling a ↵Andreas Huber2011-03-021-0/+6
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | discontinuity."
| * | | | | | Allow optional specification of a PTS timestamp when signalling a discontinuity.Andreas Huber2011-03-021-0/+6
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If present, rendering will be suppressed until reaching the timestamp. Change-Id: Ic64bdf4225063c5a4d042ea9809960b843a46d19 related-to-bug: 3489454
* | | | | | Fade out the mouse pointer after inactivity or other events.Jeff Brown2011-03-023-0/+120
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fades out the mouse pointer: - after 15 seconds of inactivity normally - after 3 seconds of inactivity in lights out mode - after a non-modifier key down - after a touch down Extended the native Looper to support enqueuing time delayed messages. This is used by the PointerController to control pointer fade timing. Change-Id: I87792fea7dbe2d9376c78cf354fe3189a484d9da
* | | | | Merge "Add support for up to 32 buffers per Surface"Mathias Agopian2011-03-011-3/+3
|\ \ \ \ \