ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
11623 commits 1 branch 0 tags 217 MiB
Commit graph

1477 commits

Author SHA1 Message Date
Chih-Hung Hsieh
62ea6b268f am ce1928e9: Merge "Add required casts for clang/llvm -Wc++11-narrowing" 
* commit 'ce1928e987923a276ff048c69d9a6f43f22610ba':
  Add required casts for clang/llvm -Wc++11-narrowing
 2015-01-13 17:51:27 +00:00
Chih-Hung Hsieh
ba8cdf99a4 Add required casts for clang/llvm -Wc++11-narrowing 
system/core/include/utils/Mutex.h:134:25: error: non-constant-expression
cannot be narrowed from type 'long long' to '__kernel_time_t' (aka
'long') in initializer list [-Wc++11-narrowing]

system/core/include/utils/Mutex.h:135:26: error: non-constant-expression
cannot be narrowed from type 'long long' to 'long' in initializer list
[-Wc++11-narrowing]

Change-Id: Icb9df26aeb01617da5ab1c36987289f7c2b11954
 2015-01-12 16:53:52 -08:00
Elliott Hughes
4d9ddb14c0 am ec556521: Merge "Remove HAVE_LIBC_SYSTEM_PROPERTIES and HAVE_SYSTEM_PROPERTY_SERVER." 
* commit 'ec556521e23f66ea52e41a7d9540b2dec31766c5':
  Remove HAVE_LIBC_SYSTEM_PROPERTIES and HAVE_SYSTEM_PROPERTY_SERVER.
 2015-01-12 22:28:11 +00:00
Elliott Hughes
ae52165490 Remove HAVE_LIBC_SYSTEM_PROPERTIES and HAVE_SYSTEM_PROPERTY_SERVER. 
Change-Id: I3d92dbecebd2bb449a8c4332de684919a58847ad
 2015-01-12 13:56:34 -08:00
Elliott Hughes
508a1a4df7 am 9da414f9: Merge "Linux always has POSIX clocks available." 
* commit '9da414f95e06979e60b48380afbf5372c1ef0ef3':
  Linux always has POSIX clocks available.
 2015-01-10 00:42:40 +00:00
Elliott Hughes
76f0a84f6a Linux always has POSIX clocks available. 
pixelflinger doesn't have to run on the Mac, but the Condition
code might.

Change-Id: Ib4e9b4daa6e848ffd5742959427b172d45f08e3c
 2015-01-09 16:17:46 -08:00
Elliott Hughes
55410c4e62 am 4c6c6d1c: Merge "You either have winsock or <sys/sockets.h>." 
* commit '4c6c6d1c7ed7d8481d717f949c18657efa5533af':
  You either have winsock or <sys/sockets.h>.
 2015-01-09 22:02:26 +00:00
Elliott Hughes
3906c8511e You either have winsock or <sys/sockets.h>. 
There is no third choice.

Change-Id: I8f1206f22798f747896dd53f3081cdfa4b1707c4
 2015-01-09 12:21:51 -08:00
Jesse Hall
ec8e7e2ccb am 7208a015: Merge "Mutex: add timedLock() method" 
* commit '7208a01514284becbd32cf4dfd256e4b10448f8e':
  Mutex: add timedLock() method
 2015-01-07 18:12:00 +00:00
Jesse Hall
7208a01514 Merge "Mutex: add timedLock() method" 2015-01-07 18:01:11 +00:00
Jesse Hall
601424a84f Mutex: add timedLock() method 
This is not available for host builds because OSX doesn't have
pthread_mutex_timedlock() or equivalent.

Bug: 18842510
Change-Id: I072e74ab1a6f770fd245828b39c5f954dda1113b
 2015-01-07 08:06:51 -08:00
Mark Salyzyn
aeeaee58a1 am e892279b: Merge "liblog: Add log_time += operator" 
* commit 'e892279b3a29060d873bd65e55b3a613e61fe04d':
  liblog: Add log_time += operator
 2015-01-05 20:24:57 +00:00
Mark Salyzyn
decd92945f liblog: Add log_time += operator 
Change-Id: I1d2987b6cb333fc344d4fee1b7bb25f32a4143c6
 2015-01-05 16:27:54 +00:00
Dan Albert
977b84140f am da4f30c5: Merge "Remove incompatible Unicode compatibility types." 
* commit 'da4f30c5b451091068ecb5f6fa3697a7dd6bb7df':
  Remove incompatible Unicode compatibility types.
 2014-12-12 02:53:25 +00:00
Dan Albert
da4f30c5b4 Merge "Remove incompatible Unicode compatibility types." 2014-12-12 02:42:30 +00:00
Chih-Hung Hsieh
d3653c90cd am 3570072c: Merge "Use full qualified name in macros." 
* commit '3570072c362fc379ac83bcae6d9ff43db06ffcfb':
  Use full qualified name in macros.
 2014-12-11 19:54:27 +00:00
Chih-Hung Hsieh
c777f213b3 Use full qualified name in macros. 
The ANDROID_SINGLETON_STATIC_INSTANCE is used in some files
out of the android namespace. If it does not use full qualified
names, users of this macro will need to use it inside the 'android'
namespace to avoid warnings from clang compiler.

Change-Id: Ie4d4ba2b57fdc72d0deb3b7c2326304a44a1300f
 2014-12-11 11:19:57 -08:00
Eric Laurent
4108bccbe8 am 4fca5918: audio: add usage "virtual source" to audio attributes. 
* commit '4fca59181c838b91572d1b57cb74b26d0a70528f':
  audio: add usage "virtual source" to audio attributes.
 2014-12-10 22:20:09 +00:00
Eric Laurent
4fca59181c audio: add usage "virtual source" to audio attributes. 
Bug: 16006090.
Change-Id: I2d22b52e97095b57a6508b82bd11e27f860bb2e7
 2014-12-09 12:13:13 -08:00
Eric Laurent
be7bb9004c am 47f52f24: audio: new stream types 
* commit '47f52f247d6d895878b831de448f19b98225515d':
  audio: new stream types
 2014-11-26 12:01:50 +00:00
Elliott Hughes
bbd3b7edd7 am c0ac9313: Merge "Only Windows doesn\'t have <sys/uio.h>." 
* commit 'c0ac9313e942fb7d3a027cec41904c18d8841521':
  Only Windows doesn't have <sys/uio.h>.
 2014-11-25 21:55:37 +00:00
Elliott Hughes
111e3d3d9c Only Windows doesn't have <sys/uio.h>. 
This should probably be in libcutils instead, so code that needs to
care about Windows can use readv/writev.

Change-Id: I7c2ceec3f742cee0e44f69fd4c88459376bd0e08
 2014-11-25 13:27:43 -08:00
Elliott Hughes
a0959e90f5 am 8eb770d3: Merge "Remove long-dead readtty." 
* commit '8eb770d37cd9470630fdbe496f22b7a04549fef7':
  Remove long-dead readtty.
 2014-11-25 19:03:12 +00:00
Elliott Hughes
b120134bd1 Remove long-dead readtty. 
Change-Id: I15ae14542214a3802d43892da0d03cfb33e63c96
 2014-11-24 12:01:21 -08:00
Eric Laurent
47f52f247d audio: new stream types 
Added stream types for internal use by audio policy
and audio flinger.

Bug: 18067208.
Change-Id: I90fd4df9ed5e0d8fb8c220d67e95fd0e32a06f14
 2014-11-24 10:41:21 -08:00
Elliott Hughes
b741221117 am 456661e3: Merge "Fix Mac build." 
* commit '456661e38cefe1afbf640036f710f0d481b64bf9':
  Fix Mac build.
 2014-11-22 15:42:41 +00:00
Elliott Hughes
8c275ffcba Fix Mac build. 
Change-Id: Iae697ae257cf4b1d675e2b758dd31d5a6a71ae4d
 2014-11-22 07:25:02 -08:00
Elliott Hughes
e79cd67cfd am 0101b06f: Merge "Kill HAVE_BIG_ENDIAN, HAVE_ENDIAN_H, and HAVE_LITTLE_ENDIAN." 
* commit '0101b06fa6f9863ee87e89757e70900c3a0e7bfc':
  Kill HAVE_BIG_ENDIAN, HAVE_ENDIAN_H, and HAVE_LITTLE_ENDIAN.
 2014-11-22 08:01:20 +00:00
Elliott Hughes
97ac0e1bb4 Kill HAVE_BIG_ENDIAN, HAVE_ENDIAN_H, and HAVE_LITTLE_ENDIAN. 
Change-Id: I9e25ac9d27e95b04fb8bf7a66c619af0139d8b8f
 2014-11-21 23:10:45 -08:00
Dan Albert
5ef3bcc768 am 5d8a5ade: Merge "Add a pre-C++11 constexpr compatibility macro." 
* commit '5d8a5ade620be65e0e658dbb99e66398f3ffdc74':
  Add a pre-C++11 constexpr compatibility macro.
 2014-11-20 20:21:55 +00:00
Dan Albert
c59932f937 Remove incompatible Unicode compatibility types. 
As well intentioned as these were, uint16_t and C++11's char16_t are
_not_ actually compatible. They are not implicitly convertible, and
they mangle differently, so they are not even ABI compatible. In our
now wonderous world of C++11, no one should be using these, so just
kill them.

Bug: 18300613
Change-Id: I06d92d7f1d937dd94a620874323d4c50eb6a31bd
 2014-11-20 11:54:39 -08:00
Dan Albert
e4c649c9fc Add a pre-C++11 constexpr compatibility macro. 
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
 2014-11-20 10:47:55 -08:00
Elliott Hughes
83ebca0290 am ac252357: Merge "Remove atomic-inline.h." 
* commit 'ac252357bb15cdeb7d4637a1cfeaa76810514715':
  Remove atomic-inline.h.
 2014-11-17 23:16:44 +00:00
Elliott Hughes
c3914d2be2 Remove atomic-inline.h. 
Change-Id: I3ac0229b9c516744e6a9c9d9e795b43bc9c5636b
 2014-11-17 14:38:56 -08:00
Elliott Hughes
ba96de5f65 am 3ef0460e: Merge "Remove the error-prone TARGET_CPU_SMP from system/core." 
* commit '3ef0460e86f2a7c5442bcf424b8e83fdfb8e3669':
  Remove the error-prone TARGET_CPU_SMP from system/core.
 2014-11-17 19:40:16 +00:00
Elliott Hughes
e9ca709a73 Remove the error-prone TARGET_CPU_SMP from system/core. 
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
 2014-11-17 11:16:59 -08:00
Hans Boehm
0b7f368442 am 64d7117e: Merge "Second attempt to "Rewrite atomic.h to use stdatomic.h."" 
* commit '64d7117efc7f7b8b477cd216a119b07041d8f406':
  Second attempt to "Rewrite atomic.h to use stdatomic.h."
 2014-11-14 00:26:51 +00:00
Hans Boehm
c56648948c Second attempt to "Rewrite atomic.h to use stdatomic.h." 
This should not be committed until win_sdk and aarch64 builds are
fixed in the presence of this CL.

This reverts commit 2789faabfa.

We additionally remove uniprocessor support from the earlier CL,
thus avoiding a potential compiler code reordering issue.

Change-Id: I7207a5ca2efa907a6f757f172d7090a62b2311fe
 2014-11-13 15:59:10 -08:00
Yabin Cui
556f43820f am 2c0839e9: Merge "kill HAVE_POSIX_FILEMAP" 
* commit '2c0839e9dba6d9d282f8391c3edb14236f56618d':
  kill HAVE_POSIX_FILEMAP
 2014-11-11 19:53:38 +00:00
Yabin Cui
266092c52d kill HAVE_POSIX_FILEMAP 
Bug: 18315579
Change-Id: I0bd5fb946b12cb90e0c9c73a478df41609b8c3e2
 2014-11-11 10:31:30 -08:00
Nick Kralevich
d6520cf958 am 65a83bdf: Merge "Reserve some AIDs for OEMs" 
* commit '65a83bdf2ea1643449294a23a450e5a8a5b5058c':
  Reserve some AIDs for OEMs
 2014-11-10 17:51:34 +00:00
Nick Kralevich
65a83bdf2e Merge "Reserve some AIDs for OEMs" 2014-11-10 17:42:58 +00:00
Johan Redestig
60ac6364ec Reserve some AIDs for OEMs 
OEMs frequently add some AIDs on their own. Reserve some range
for them to use.

Change-Id: I3c729c889c9bd3e105ae4f6fb0c04a42a10eb25c
 2014-11-10 08:14:21 +01:00
Stephen Hines
96031a9985 am f02c7972: Merge "Move winsock2.h in front of a potential windows.h include." 
* commit 'f02c7972560bc512552830c8110d026136a3a87f':
  Move winsock2.h in front of a potential windows.h include.
 2014-11-09 09:03:31 +00:00
Dan Albert
7c7a782cad am aaa920d7: Merge "Make Unicode.h use types that match libc++." 
* commit 'aaa920d7969d9dd4b9e7871f2758d9092095bead':
  Make Unicode.h use types that match libc++.
 2014-11-09 09:03:30 +00:00
Stephen Hines
f02c797256 Merge "Move winsock2.h in front of a potential windows.h include." 2014-11-09 07:24:43 +00:00
Stephen Hines
7e34121e39 Move winsock2.h in front of a potential windows.h include. 
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
 2014-11-08 19:30:05 -08:00
Dan Albert
2f5ad5ff86 Make Unicode.h use types that match libc++. 
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
 2014-11-08 20:22:30 +00:00
Calin Juravle
4de4e6defc resolved conflicts for merge of e3c22c41 to stage-aosp-master 
Change-Id: I566aeb2e2de15813ee199d4635098029457fdf3d
 2014-10-28 19:09:50 +00:00
Calin Juravle
0f31008eaf Merge "Handle code_cache dir creation in libnativebridge" into lmp-mr1-dev 
automerge: 9c094da

* commit '9c094da83112bbcad37eaffecfee96ff169d84a8':
  Handle code_cache dir creation in libnativebridge
 2014-10-28 18:08:02 +00:00