summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* am 47f52f24: audio: new stream typesEric Laurent2014-11-261-4/+8
|\ | | | | | | | | * commit '47f52f247d6d895878b831de448f19b98225515d': audio: new stream types
| * audio: new stream typesEric Laurent2014-11-241-4/+8
| | | | | | | | | | | | | | | | Added stream types for internal use by audio policy and audio flinger. Bug: 18067208. Change-Id: I90fd4df9ed5e0d8fb8c220d67e95fd0e32a06f14
* | am c0ac9313: Merge "Only Windows doesn\'t have <sys/uio.h>."Elliott Hughes2014-11-251-5/+8
|\ \ | | | | | | | | | | | | * commit 'c0ac9313e942fb7d3a027cec41904c18d8841521': Only Windows doesn't have <sys/uio.h>.
| * | Only Windows doesn't have <sys/uio.h>.Elliott Hughes2014-11-251-5/+8
| | | | | | | | | | | | | | | | | | | | | This should probably be in libcutils instead, so code that needs to care about Windows can use readv/writev. Change-Id: I7c2ceec3f742cee0e44f69fd4c88459376bd0e08
* | | am 8eb770d3: Merge "Remove long-dead readtty."Elliott Hughes2014-11-251-1/+0
|\ \ \ | |/ / | | | | | | | | | * commit '8eb770d37cd9470630fdbe496f22b7a04549fef7': Remove long-dead readtty.
| * | Remove long-dead readtty.Elliott Hughes2014-11-241-1/+0
| | | | | | | | | | | | Change-Id: I15ae14542214a3802d43892da0d03cfb33e63c96
* | | am 456661e3: Merge "Fix Mac build."Elliott Hughes2014-11-221-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '456661e38cefe1afbf640036f710f0d481b64bf9': Fix Mac build.
| * | Fix Mac build.Elliott Hughes2014-11-221-1/+1
| | | | | | | | | | | | Change-Id: Iae697ae257cf4b1d675e2b758dd31d5a6a71ae4d
* | | am 0101b06f: Merge "Kill HAVE_BIG_ENDIAN, HAVE_ENDIAN_H, and ↵Elliott Hughes2014-11-221-10/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | HAVE_LITTLE_ENDIAN." * commit '0101b06fa6f9863ee87e89757e70900c3a0e7bfc': Kill HAVE_BIG_ENDIAN, HAVE_ENDIAN_H, and HAVE_LITTLE_ENDIAN.
| * | Kill HAVE_BIG_ENDIAN, HAVE_ENDIAN_H, and HAVE_LITTLE_ENDIAN.Elliott Hughes2014-11-211-10/+5
| | | | | | | | | | | | Change-Id: I9e25ac9d27e95b04fb8bf7a66c619af0139d8b8f
* | | am 5d8a5ade: Merge "Add a pre-C++11 constexpr compatibility macro."Dan Albert2014-11-201-0/+11
|\ \ \ | |/ / | | | | | | | | | * commit '5d8a5ade620be65e0e658dbb99e66398f3ffdc74': Add a pre-C++11 constexpr compatibility macro.
| * | Add a pre-C++11 constexpr compatibility macro.Dan Albert2014-11-201-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | Needed for cases where something should be constexpr if possible, but not being constexpr is fine if in pre-C++11 code (such as a const static float member variable). Bug: 18466763 Change-Id: I635d062575ba2fbc4cbe3a89f730128c404d95e1
* | | am ac252357: Merge "Remove atomic-inline.h."Elliott Hughes2014-11-173-21/+2
|\ \ \ | |/ / | | | | | | | | | * commit 'ac252357bb15cdeb7d4637a1cfeaa76810514715': Remove atomic-inline.h.
| * | Remove atomic-inline.h.Elliott Hughes2014-11-173-21/+2
| | | | | | | | | | | | Change-Id: I3ac0229b9c516744e6a9c9d9e795b43bc9c5636b
* | | am 3ef0460e: Merge "Remove the error-prone TARGET_CPU_SMP from system/core."Elliott Hughes2014-11-172-8/+0
|\ \ \ | |/ / | | | | | | | | | * commit '3ef0460e86f2a7c5442bcf424b8e83fdfb8e3669': Remove the error-prone TARGET_CPU_SMP from system/core.
| * | Remove the error-prone TARGET_CPU_SMP from system/core.Elliott Hughes2014-11-172-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | This means that code that uses libcutils no longer has to ensure that it's set ANDROID_SMP in the calling code's Android.mk for this to function correctly. Change-Id: I80c7ff170cd621106f34d6b74689d6b4f03e4eb7
* | | am 64d7117e: Merge "Second attempt to "Rewrite atomic.h to use stdatomic.h.""Hans Boehm2014-11-148-1039/+112
|\ \ \ | |/ / | | | | | | | | | * commit '64d7117efc7f7b8b477cd216a119b07041d8f406': Second attempt to "Rewrite atomic.h to use stdatomic.h."
| * | Second attempt to "Rewrite atomic.h to use stdatomic.h."Hans Boehm2014-11-138-1039/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should not be committed until win_sdk and aarch64 builds are fixed in the presence of this CL. This reverts commit 2789faabfa9cdf16902a52a1de3fc4a7ae98efed. We additionally remove uniprocessor support from the earlier CL, thus avoiding a potential compiler code reordering issue. Change-Id: I7207a5ca2efa907a6f757f172d7090a62b2311fe
* | | am 2c0839e9: Merge "kill HAVE_POSIX_FILEMAP"Yabin Cui2014-11-111-2/+2
|\ \ \ | |/ / | | | | | | | | | * commit '2c0839e9dba6d9d282f8391c3edb14236f56618d': kill HAVE_POSIX_FILEMAP
| * | kill HAVE_POSIX_FILEMAPYabin Cui2014-11-111-2/+2
| | | | | | | | | | | | | | | Bug: 18315579 Change-Id: I0bd5fb946b12cb90e0c9c73a478df41609b8c3e2
* | | am 65a83bdf: Merge "Reserve some AIDs for OEMs"Nick Kralevich2014-11-101-0/+5
|\ \ \ | |/ / | | | | | | | | | * commit '65a83bdf2ea1643449294a23a450e5a8a5b5058c': Reserve some AIDs for OEMs
| * | Merge "Reserve some AIDs for OEMs"Nick Kralevich2014-11-101-0/+5
| |\ \
| | * | Reserve some AIDs for OEMsJohan Redestig2014-11-101-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | OEMs frequently add some AIDs on their own. Reserve some range for them to use. Change-Id: I3c729c889c9bd3e105ae4f6fb0c04a42a10eb25c
* | | | am f02c7972: Merge "Move winsock2.h in front of a potential windows.h include."Stephen Hines2014-11-091-0/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'f02c7972560bc512552830c8110d026136a3a87f': Move winsock2.h in front of a potential windows.h include.
| * | | Merge "Move winsock2.h in front of a potential windows.h include."Stephen Hines2014-11-091-0/+4
| |\ \ \
| | * | | Move winsock2.h in front of a potential windows.h include.Stephen Hines2014-11-081-0/+4
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Files that included FileMap.h (possibly transitively), before including ByteOrder.h (which pulls in winsock2.h directly), will experience a compiler warning/error from the latest mingw headers. This happens because the headers require that winsock2.h come before windows.h in all cases. The simplest (and most error-proof) fix for now is to include winsock2.h before this use of windows.h. Change-Id: I33069e4c9962d9820d0ea5976554f89d7ff6307c
* | | | am aaa920d7: Merge "Make Unicode.h use types that match libc++."Dan Albert2014-11-091-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'aaa920d7969d9dd4b9e7871f2758d9092095bead': Make Unicode.h use types that match libc++.
| * | | Make Unicode.h use types that match libc++.Dan Albert2014-11-081-2/+2
| |/ / | | | | | | | | | | | | | | | | | | libc++ also defines these types for pre-C++11, and the two definitions need to match to avoid redefinition errors. Bug: 18300613 Change-Id: I1e9198d39f7c470f37bc6edba2dca2d499f54c9b
| * | resolved conflicts for merge of e3c22c41 to stage-aosp-masterCalin Juravle2014-10-281-1/+1
| |\ \ | | | | | | | | | | | | Change-Id: I566aeb2e2de15813ee199d4635098029457fdf3d
| | * | Handle code_cache dir creation in libnativebridgeCalin Juravle2014-10-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also: - add kPreInitiliazed state to native bridge with check transition: kOpened->kPreInitialized->kInitialized - made sure we free the memory for the code_cache_path - tidy up some error messages - tidy up tests - add a dummy native bridge to test with Bug: 18027433 Bug: 18097480 Change-Id: I39f74c93580f2e224080dd3df2ffaa9cf9f8cd9c
| * | | am 07f1300c: am 7979f1ce: Merge "Do not inline rarely used trace function ↵Chih-Hung Hsieh2014-10-151-39/+11
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | bodies." * commit '07f1300c4c4f7d3c0df540bf8df3443c3f4539cd': Do not inline rarely used trace function bodies.
| * | | am 072877af: am 41198eea: Merge "Revert "Rewrite atomic.h to use stdatomic.h.""Hans Boehm2014-10-048-124/+1039
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '072877af485d49f11e227c0d22a7bb4a341533d6': Revert "Rewrite atomic.h to use stdatomic.h."
| * \ \ \ am f5204549: am 028928fe: Merge "Rewrite atomic.h to use stdatomic.h."Hans Boehm2014-10-048-1039/+124
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f5204549faf7310cc808bcb3676fb36268178e26': Rewrite atomic.h to use stdatomic.h.
| * \ \ \ \ resolved conflicts for merge of 64884bb1 to lmp-dev-plus-aospAndreas Gampe2014-09-241-3/+28
| |\ \ \ \ \
| * \ \ \ \ \ am f6cce347: audio: add HW hotword capture flagEric Laurent2014-09-241-3/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f6cce347a73e3b3da9ff6698ead25b5a543ce47b': audio: add HW hotword capture flag
| * \ \ \ \ \ \ am fbb4188c: am d559d6c7: Merge "defined(HAVE_OFF_T) is really just ↵Elliott Hughes2014-09-231-8/+4
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | !defined(__APPLE__)." * commit 'fbb4188cfac18b457801cf3e304bfa39dd29dde8': defined(HAVE_OFF_T) is really just !defined(__APPLE__).
* | \ \ \ \ \ \ \ Merge "Handle code_cache dir creation in libnativebridge" into lmp-mr1-devCalin Juravle2014-10-281-1/+1
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 9c094da * commit '9c094da83112bbcad37eaffecfee96ff169d84a8': Handle code_cache dir creation in libnativebridge
| * | | | | | | | Handle code_cache dir creation in libnativebridgeCalin Juravle2014-10-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also: - add kPreInitiliazed state to native bridge with check transition: kOpened->kPreInitialized->kInitialized - made sure we free the memory for the code_cache_path - tidy up some error messages - tidy up tests - add a dummy native bridge to test with Bug: 18027433 Bug: 18097480 (cherry picked from commit f9d9e2a2d96559c3165405d572b08e260156074a) Change-Id: I9ce578949dbe522d5033465df7ca49fdd3aa3cbf
* | | | | | | | | am 07f1300c: am 7979f1ce: Merge "Do not inline rarely used trace function ↵Chih-Hung Hsieh2014-10-151-39/+11
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bodies." * commit '07f1300c4c4f7d3c0df540bf8df3443c3f4539cd': Do not inline rarely used trace function bodies.
| * | | | | | | | Do not inline rarely used trace function bodies.Chih-Hung Hsieh2014-10-141-39/+11
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When atrace_* functions are inlined, the rarely used 1024-byte buffers are allocated on stack. BUG: 17444504 Change-Id: I773512aeb70e8b79f3803c6d59cba064d2aa65b6
* | | | | | | | am 4b0374ae: am 4c4cf467: modified AUDIO_SOURCE_FM_TUNER enum value for ↵Carson Liao2014-10-071-1/+1
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FM feature * commit '4b0374ae1a97cff279f287dded14619e9579da62': modified AUDIO_SOURCE_FM_TUNER enum value for FM feature
| * | | | | | | modified AUDIO_SOURCE_FM_TUNER enum value for FM featureCarson Liao2014-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Review: https://partner-android-review.git.corp.google.com/#/c/183993 Signed-off-by: Carson Liao <carson.liao@mediatek.com> Change-Id: I8d70b197bcdc710119031bcf622fee0c1b3b3aa7
| * | | | | | | am b3facbfd: LibNativeBridge: Add early init & env setupjgu212014-09-291-3/+28
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b3facbfdecf46eb7c063b99529ab8c18a08a6b42': LibNativeBridge: Add early init & env setup
| | * | | | | | | LibNativeBridge: Add early init & env setupjgu212014-09-261-3/+28
| | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a method to set up /proc/cpuinfo with enough privileges. Set up the environment for an app in InitializeNativeBridge(). Turn on -Wall for libnativebridge. (cherry picked from commit 962eb40abb68eb60077da158755b6a09c306aa41) (cherry picked from commit ab0da5a9a6860046619629b8e6b83692d35dff86) (cherry picked from commit 2f71cb24fa16c0388591918f1354d1f8608cc6e5) (cherry picked from commit 04054e28e24866d76034236843490829b80df40c) (cherry picked from commit 4390a632366ecf89af5f6c0fed39baf9aab2d0f1) Bug: 17671501 Change-Id: Id4f4127d82737b5e56a77175e1068ff5cea60f9d
* | | | | | | | am 072877af: am 41198eea: Merge "Revert "Rewrite atomic.h to use stdatomic.h.""Hans Boehm2014-10-048-124/+1039
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | * commit '072877af485d49f11e227c0d22a7bb4a341533d6': Revert "Rewrite atomic.h to use stdatomic.h."
| * | | | | | | Revert "Rewrite atomic.h to use stdatomic.h."Hans Boehm2014-10-048-124/+1039
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit cb344d464009337c283431dec4441b70481d1a49. Change-Id: Ib17cd8d00695062177ce863cedc4ec7148012317
* | | | | | | am f5204549: am 028928fe: Merge "Rewrite atomic.h to use stdatomic.h."Hans Boehm2014-10-048-1039/+124
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'f5204549faf7310cc808bcb3676fb36268178e26': Rewrite atomic.h to use stdatomic.h.
| * | | | | | Rewrite atomic.h to use stdatomic.h.Hans Boehm2014-10-018-1039/+124
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace atomic-inl.h with a file that just includes atomic.h. Remove platform specific implementations. Change-Id: If16d74fbe0af7836ed8c1296c17e13a2d0d20f64
* | | | | | am fcbb23ad: [AU] Update volume setting and Audio Device API 3.0Hochi Huang2014-09-261-0/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * commit 'fcbb23adc939dd27122d962e5f7e7f016259f03e': [AU] Update volume setting and Audio Device API 3.0
| * | | | | [AU] Update volume setting and Audio Device API 3.0Hochi Huang2014-09-251-0/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Signed-off-by: Hochi Huang <hochi.huang@mediatek.com> Change-Id: I772584ae05e6a8d2fdc8c4a52e44ad80c3c1a4a7
generated by cgit v1.1 at 2025-01-11 01:23:51 +0000