summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Add Japanese specific key codes."Jeff Brown2012-04-021-0/+8
|\
| * Add Japanese specific key codes.Yang Chuang2012-04-021-0/+8
| | | | | | | | | | | | | | | | | | These keys are specific to Japanese hardware keyboard which can be used by input method. Patch ported from AOSP, with the addition of EISU and KANA mappings. Change-Id: I647473cdd257458e3b9d134b0fc623eae946c3e0
* | Allow fine-grained control over functors executionRomain Guy2012-04-021-3/+14
|/ | | | | | Adds non-drawing execution mode Change-Id: I82f92cf1b9a3b9ff2ca6d7427c4e02b73e04e6bf
* Move services/powermanager from frameworks/base to frameworks/nativeColin Cross2012-03-282-70/+0
| | | | | | | | | Move services/powermanager into frameworks/native so audioflinger can use it. Note that this is not the same as a PowerManagerService, which is part of systemserver and handles turning the screen on and off, etc. This is just a binder interface to allow taking wakelocks. Change-Id: I1142e6d9ddbb651cc19ac07d946fa24d8feed8a3
* Deleted the media, camera, drm related files since they are relocatedJames Dong2012-03-28111-14177/+0
| | | | Change-Id: I9bc5573ee07e30b305b5b879023aa9ec69e10b91
* Merge "Use a status_t return type for GL functors"Romain Guy2012-03-261-0/+17
|\
| * Use a status_t return type for GL functorsRomain Guy2012-03-261-0/+17
| | | | | | | | | | | | | | | | | | WebView needs more fine-grained control over the behavior of the framework upon execution of the display lists. The new status_t allows WebView to requests its functor to be re-executed directly without causing a redraw of the entire hierarchy. Change-Id: I97a8141dc5c6eeb6805b6024cc1e76fce07d24cc
* | Merge "mv libcpustats from frameworks/base to /native"Glenn Kasten2012-03-263-220/+0
|\ \
| * | mv libcpustats from frameworks/base to /nativeGlenn Kasten2012-03-263-220/+0
| | | | | | | | | | | | | | | | | | OK to lose history Change-Id: I05ce0452f16a396cff6e18db5424492f3a6f6861
* | | Merge "Provisional support for secure decryption of media streams."Andreas Huber2012-03-268-3/+100
|\ \ \
| * | | Provisional support for secure decryption of media streams.Andreas Huber2012-03-268-3/+100
| |/ / | | | | | | | | | Change-Id: Ib3982a9c960bfdb0cb7e1b174440b141b194cfbe
* | | Merge "reorganize SoundPool and JetPlayer code."Eric Laurent2012-03-261-3/+2
|\ \ \ | |/ / |/| |
| * | reorganize SoundPool and JetPlayer code.Eric Laurent2012-03-261-3/+2
| |/ | | | | | | | | | | | | | | | | | | Reorganize SoundPool and JetPlayer code to be ready for the creation of libmedia_native. Split SoundPool between libsoundpool (JNI) and libmedia(sound pool implementation). Remove dependencies on nativehelper/jni.h from JetPlayer. Change-Id: I130c6014173b714329929dd82c5dfb70b757a610
* | Add TRACK_FAST for IAudioFlinger::createTrackGlenn Kasten2012-03-261-2/+3
| | | | | | | | | | | | Currently not implemented by client or server Change-Id: Ib11dda57db3eeb871bcc7b546e340078776875f5
* | Merge "IAudioFlinger::createTrack and openRecord flags"Glenn Kasten2012-03-262-4/+9
|\ \
| * | IAudioFlinger::createTrack and openRecord flagsGlenn Kasten2012-03-192-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | createTrack and openRecord don't need the "old" flags parameter, which was either audio_policy_output_t or audio_in_acoustics_t shifted left by 16 bits. But they do need "new" flags, which are defined by the application use case. Initially, the only application use case flag is timed output, but others are planned. For output, the audio_policy_output_t flags are passed to AudioSystem::getOutput, which returns an audio_io_handle_t, and that handle is then passed to createTrack. So createTrack doesn't need the old flags parameter. For input, the audio_in_acoustics_t flags are passed to AudioSystem::getInput, which returns an audio_io_handle_t, and that handle is then passed to openRecord. So openRecord doesn't need the old flags parameter. Change-Id: I18a9870911846cca69d420c19fe6a9face2fe8c4
* | | remove jni.h include from IOMX.hColin Cross2012-03-241-2/+0
| | | | | | | | | | | | | | | | | | | | | jni.h is not used in IOMX.h and is not available in pdk builds, remove it. Change-Id: I9bc8fd70f617942712d9f684c6fc927bf18be753
* | | Fixed missing return value from a method should have returned status_tJames Dong2012-03-241-1/+1
| |/ |/| | | | | Change-Id: I83ad2735eaf8a8dfa5f8f29f30aec1311b3222de
* | frameworks/base: move Zip* from libandroidfw to libutilsColin Cross2012-03-224-391/+1
| | | | | | | | | | | | | | ZipUtils is needed by build/tools, move it from libandroidfw (frameworks/base) to libutils (frameworks/native). Change-Id: I2b4b7adcdf68eb25ee7cba5dd3b69eadf0523af3
* | Merge "Remove enforceFrameCount"Glenn Kasten2012-03-221-2/+1
|\ \
| * | Remove enforceFrameCountGlenn Kasten2012-03-211-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | It was only used to decide whether to issue a warning. The warning was issued the first time track was created but not at re-creation. Now it is a verbose message every time, not a warning since it happens all the time with key clicks on A2DP. Change-Id: I9d39f53c0a7eb84b666e55b1b76ff830cf8f37ba
* | | Support gapless playback for mp3 and m4aMarco Nelissen2012-03-222-0/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | Gapless playback for appropriately tagged mp3 and m4a files. Currently this is implemented in OMXCodec, which most players use, but should be easy to support in other players as well by using the SkipCutBuffer utility class. Change-Id: I748c669adc1cfbe5ee9a7dea2fad945d48882551
* | | Merge "Add MetaData::dumpToLog"Marco Nelissen2012-03-211-0/+4
|\ \ \ | |/ / |/| |
| * | Add MetaData::dumpToLogMarco Nelissen2012-03-211-0/+4
| | | | | | | | | | | | | | | | | | Utility method for dumping the content of a MetaData object to the log. Change-Id: I2d91b991e1d9fed2215e8995a73c2b1854205074
* | | Merge "Whitespace"Glenn Kasten2012-03-212-3/+4
|\ \ \ | |/ / |/| |
| * | WhitespaceGlenn Kasten2012-03-192-3/+4
| |/ | | | | | | | | | | Fix indentation, and add blank lines in key places for clarity Change-Id: I57a0a8142394f83203161aa9b8aa9276abf3ed7c
* | Merge "Parse mp3 encoder padding/delay"Marco Nelissen2012-03-201-0/+2
|\ \ | |/ |/|
| * Parse mp3 encoder padding/delayMarco Nelissen2012-03-201-0/+2
| | | | | | | | | | | | Get the mp3 encoder padding and delay from a XING frame or iTunSMPB tag. Change-Id: Icde598c8857d7e7c187a718f478ee9799d6a1b8a
* | Merge "If an application calls System.exit() terminate it immediately."Jeff Brown2012-03-161-5/+11
|\ \
| * | If an application calls System.exit() terminate it immediately.Jeff Brown2012-03-151-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no graceful way to kill Android application processes. They typically have many threads running doing various things When System.exit() is called, those threads just keep going while the cleanup actions run until the process finally. Performing shutdown actions can easily cause more harm than good. For example, closing the Binder driver's file descriptor may cause other threads waiting on Binder to wake up and then crash in nasty ways after receiving EBADF. So when an Android application exits, skip the cleanup and just call _exit() to end it all. Bug: 6168809 Change-Id: I29790c064426a0bf7dae7cdf444eea3eef1d5275
* | | Merge "Add a new camera open API that allows taking the ownership."Wu-cheng Li2012-03-152-2/+2
|\ \ \
| * | | Add a new camera open API that allows taking the ownership.Wu-cheng Li2012-03-152-2/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The purpose is to let face unlock always get the camera successfully. What happened was the camera applications may have opened the camera in onResume under the lock screen. This API lets face unlock take the camera from the camera application. A new permission will be added, so other applicatoins won't be able to take the camera from the face unlock. bug:5584464 Change-Id: Ib3d9dcbc2161815b68db42327dc01148453704c6
* | | Merge "Move CameraParameters.h to frameworks/native."Eino-Ville Talvala2012-03-151-666/+0
|\ \ \ | |/ / |/| |
| * | Move CameraParameters.h to frameworks/native.Eino-Ville Talvala2012-03-141-666/+0
| | | | | | | | | | | | | | | | | | | | | | | | CameraParameters.h is indirectly required to implement the Camera HAL. Move it to frameworks/native. Bug: 6171735 Change-Id: I1bf4db228333be16fc7caa3c51280a9495293011
* | | Defines MediaPlayer APIs to support multiple audio/video/timedtextInsun Kang2012-03-153-13/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tracks. o Newly introduced APIs are (MediaPlayer): getTrackInfo() / addExternalSource() / enableTrack() / disableTrack(). o Timed text tracks are supported only, for now. o TODOs: - Define the audio/video behavior for enableTrack and disableTrack. - Refactoring AwesomePlayer / TimedTextDriver so that all types of track index can be managed in the correct order and be ready for supporting audio/video tracks. (MediaExtractor and MediaSource for text file might be necessary.) Change-Id: Idb85e1b3f2ed49a64f377d05472dd6663ce94e07
* | | Merge "AudioFlinger playback thread CPU measurement in Hz"Glenn Kasten2012-03-141-26/+52
|\ \ \ | |_|/ |/| |
| * | AudioFlinger playback thread CPU measurement in HzGlenn Kasten2012-03-141-26/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Log statistics on CPU usage in Hz in addition to wall clock time Use CPU statistics for all playback threads, not just MIXER (but they are disabled by default by a compile-time debug macro). ThreadCpuUsage library: - Move statistics out of the library and leave that up to the caller - Add API to determine a CPU's frequency Change-Id: Ia1011123146e641fcf210ef26e78ae2b4d3b64ad
* | | Merge "Use correct syntax for #include <> """Glenn Kasten2012-03-141-1/+1
|\ \ \
| * | | Use correct syntax for #include <> ""Glenn Kasten2012-03-131-1/+1
| | |/ | |/| | | | | | | Change-Id: I943137108668ae66f8eba18dafe069a7951bcd8f
* | | Merge "Fix spurious ANRs in native activities."Jeff Brown2012-03-133-10/+47
|\ \ \
| * | | Fix spurious ANRs in native activities.Jeff Brown2012-03-133-10/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some native activities experienced ANRs when the input consumer deferred an input event due to client-side batching. If the input channel was fully emptied then the client had no way of knowing that it should wake up to handle the deferred input event. This patch also fixes some lock issues in the native activity input queue implementation. In at least one error case, it was possible for a function to exit without releasing the lock. Bug: 6051176 Change-Id: I4d9d843237e69b9834f8d8b360031b677fcab8c3
* | | | Merge "Gapless playback, step 1."Marco Nelissen2012-03-133-0/+6
|\ \ \ \
| * | | | Gapless playback, step 1.Marco Nelissen2012-03-133-0/+6
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Currently able to play Ogg Vorbis, PCM WAV and other lossless files seamlessly by reusing the initial AudioTrack for subsequent players. Change-Id: Ie7cf6b9076bdf4f9211574456d192c02c04fecc7
* | | | Merge "Switched to use the header files in /frameworks/native and deleted ↵James Dong2012-03-1313-7216/+0
|\ \ \ \ | |_|_|/ |/| | | | | | | the duplicate header files in /frameworks/base"
| * | | Switched to use the header files in /frameworks/nativeJames Dong2012-03-1213-7216/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and deleted the duplicate header files in /frameworks/base o related-to-bug: 6044887 Change-Id: I17e0692d9a9b5c8796ded36677c833ca8ab36795
* | | | Whitespace and indentationGlenn Kasten2012-03-1310-24/+18
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix indentation to be multiple of 4. Make it easier to search: sp< not sp < to "switch (...)" instead of "switch(...)" (also "if" and "while") Remove redundant blank line at start or EOF. Remove whitespace at end of line. Remove extra blank lines where they don't add value. Use git diff -b or -w to verify. Change-Id: I966b7ba852faa5474be6907fb212f5e267c2874e
* | | Merge "Remove virtual from methods that don't need it"Glenn Kasten2012-03-121-0/+2
|\ \ \ | |_|/ |/| |
| * | Remove virtual from methods that don't need itGlenn Kasten2012-03-091-0/+2
| |/ | | | | | | Change-Id: I30e17e61aae25b036436c0e270313c80c43e5f06
* | Use audio_policy_output_flags_t consistentlyGlenn Kasten2012-03-092-7/+8
| | | | | | | | | | | | | | | | | | | | This affects: - IAudioFlinger::openOutput - AudioTrack::AudioTrack - AudioTrack::set - apps that call these Change-Id: I26fb281bac6cb87593d17697bc9cb37a835af205
* | Merge "Use AudioRecord::record_flags consistently"Glenn Kasten2012-03-091-3/+5
|\ \ | |/ |/|