Commit graph

1566 commits

Author SHA1 Message Date
Elliott Hughes
202f024dee Add a WriteStringToFile overload that cares about permissions.
Change-Id: I857a80b61768d4e9610bdd149eff2d9d8e48d2c0
2015-02-04 14:30:23 -08:00
Elliott Hughes
8a2634c2ab am 55732f49: Merge "android_reboot should take a const char*."
* commit '55732f49287a75f9baabe9f150443aec9234c90d':
  android_reboot should take a const char*.
2015-02-04 01:20:40 +00:00
Elliott Hughes
0068da6a93 android_reboot should take a const char*.
The kernel argument is actually a void*, but it's only read from.

Change-Id: I305c50249bf12b7fbdea4721257aed52a0372f8d
2015-02-03 15:44:16 -08:00
Elliott Hughes
14fcc4c66c am e44d25d6: Merge "Add Google-style StringPrintf."
* commit 'e44d25d64537f4ea2abcb56aabc7a5bf0731c222':
  Add Google-style StringPrintf.
2015-02-03 23:33:39 +00:00
Elliott Hughes
e44d25d645 Merge "Add Google-style StringPrintf." 2015-02-03 23:23:11 +00:00
Elliott Hughes
6b3be2902d Add Google-style StringPrintf.
Change-Id: If333c28b8ed047346a2dd85e591c4bedbab874cc
2015-02-03 15:21:07 -08:00
Elliott Hughes
c3bf8d85b5 am 9fc43358: Merge "Extra Win32 compatibility."
* commit '9fc43358f72a581beb26532ea2cb1f2adc053758':
  Extra Win32 compatibility.
2015-02-03 22:36:57 +00:00
Elliott Hughes
714196d05c Extra Win32 compatibility.
Change-Id: Ibc583aba580f4fc15c243f495ead44b2ce4c6e5e
2015-02-03 14:26:58 -08:00
Elliott Hughes
813d0ac136 am 6974ba4e: Merge "Add Google-style ReadFileToString and WriteStringToFile."
* commit '6974ba4ed430ec3247c3a5c04a2263b4b04ff827':
  Add Google-style ReadFileToString and WriteStringToFile.
2015-02-03 20:33:00 +00:00
Elliott Hughes
dec12b2b71 Add Google-style ReadFileToString and WriteStringToFile.
Bug: 19217569
Change-Id: I64789d3fa6777ee30a324cdf00fdc275c1230e1b
2015-02-03 12:18:11 -08:00
Elliott Hughes
dbf6f33e84 am 2b2b7632: Merge "Revert "Remove netcfg\'s unused options.""
* commit '2b2b7632f55ca73562361cf4d06e60e7b62f7ff4':
  Revert "Remove netcfg's unused options."
2015-02-03 20:09:30 +00:00
Elliott Hughes
c463025a19 Revert "Remove netcfg's unused options."
This reverts commit f8e83054cb.

Change-Id: Iede772f96ff9008277df433dcbb5f6603de65283
2015-02-03 19:56:35 +00:00
Elliott Hughes
b862d3e8eb am 6a728fde: Merge "Remove netcfg\'s unused options."
* commit '6a728fde77d1367318c79e5b182f0cb316872a37':
  Remove netcfg's unused options.
2015-02-03 19:16:42 +00:00
Elliott Hughes
5b253e55e0 am ef89e8d1: Merge "Revert "Remove netcfg\'s unused options.""
* commit 'ef89e8d14619c68015103fd51ff75f82eeef8d61':
  Revert "Remove netcfg's unused options."
2015-02-03 19:16:42 +00:00
Elliott Hughes
1ddbd76bd8 am 67900498: Merge "Remove netcfg\'s unused options."
* commit '67900498cff54c8116b3f7afc84e046d98bb17e4':
  Remove netcfg's unused options.
2015-02-03 19:12:53 +00:00
Elliott Hughes
f8e83054cb Remove netcfg's unused options.
Only "netcfg" for a list of interfaces and "netcfg <interface> dhcp" still
seem to be used.

Change-Id: Iaf499c06b09ffe5e0925339b9cd6e502f3234a86
2015-02-03 11:08:07 -08:00
Elliott Hughes
ca77255c26 Revert "Remove netcfg's unused options."
This reverts commit 24c1885bc1.

Change-Id: Iaae6502e2db90d67b4275faa104cfc6a0abc65c6
2015-02-03 19:07:43 +00:00
Elliott Hughes
24c1885bc1 Remove netcfg's unused options.
Only "netcfg" for a list of interfaces and "netcfg <interface> dhcp" still
seem to be used.

Change-Id: Ie0aecf5b18bd854cfb5878b6cfdd7160c9f42526
2015-02-02 14:39:42 -08:00
Dmitriy Ivanov
bbbe988539 am 7cb19579: Merge "Add close_file flag to OpenArchiveFd()"
* commit '7cb19579bc22bf38e15b970f801f8065d629611d':
  Add close_file flag to OpenArchiveFd()
2015-02-02 19:14:17 +00:00
Dmitriy Ivanov
40b52b2c88 Add close_file flag to OpenArchiveFd()
* We should be able to keep fd alive after CloseArchive()

Change-Id: I1aa2c039bb2a590ae72f256acc9ba5401c2c59b1
2015-01-30 17:57:13 -08:00
Yabin Cui
631965a32e am e862350b: Merge "Kill HAVE_PTHREADS."
* commit 'e862350bb2eb3d3eda526da7f3b6d5c2dd40a445':
  Kill HAVE_PTHREADS.
2015-01-27 22:45:14 +00:00
Yabin Cui
4a6e5a3b64 Kill HAVE_PTHREADS.
Bug: 19083585
Change-Id: Ic09eb3dd250bc5c5b63cac7998f99f5fa007f407
2015-01-27 14:23:22 -08:00
Mark Salyzyn
982421df45 am 91581f19: Merge "liblog: add pstore write"
* commit '91581f19906ade01eabc6e10a7dac209e710117a':
  liblog: add pstore write
2015-01-23 23:59:45 +00:00
Mark Salyzyn
f0cc42f525 am 4730328d: Merge "logd: create private/android_logger.h"
* commit '4730328da72ef9b7aeaefc120358155fdfd8dde8':
  logd: create private/android_logger.h
2015-01-23 23:59:43 +00:00
Mark Salyzyn
d91ab5815d liblog: add pstore write
Used to push the Android log messages into pstore
(when available, and no propagation of error).

Change-Id: I9def8cf796d35d347f502d9745d5f42ec1200253
2015-01-23 23:33:31 +00:00
Mark Salyzyn
b5f6e45d6b logd: create private/android_logger.h
- create a structure to depict the private header
  expected at logd end of socket.
- utilize this new structure instead of unscalable
  byte stream technique used to unpack in logd.

Change-Id: I2d0e5c3531c279f2dc1fbd74807210ff8d804de0
2015-01-23 23:32:11 +00:00
Christopher Ferris
bd3bbff674 am d426a4e7: Merge "Move 32 bit/64 bit check into debuggerd."
* commit 'd426a4e7b62c18124827868ddbf8987aa433451b':
  Move 32 bit/64 bit check into debuggerd.
2015-01-22 00:13:01 +00:00
Christopher Ferris
9774df6134 Move 32 bit/64 bit check into debuggerd.
On 64 bit systems, calls to dump_backtrace_to_file or dump_tombstone
try and directly contact the correct debuggerd (32 bit vs 64 bit)
by reading the elf information for the executable.
Unfortunately, system_server makes a call to dump_backtrace_to_file
and it doesn't have permissions to read the executable data, so it
defaults to always contacting the 64 bit debuggerd.
This CL changes the code so that all dump requests go to the 64 bit
debuggerd, which reads the elf information and redirects requests for
32 bit processes to the 32 bit debuggerd.

Testing:

- Forced the watchdog code in system_server to dump stacks and
  verified that all native stacks are dumped correctly.
- Verified that dumpstate and bugreport still properly dump the native
  processes on a 64 bit and 32 bit system.
- Intentionally forced the 64 bit to 32 bit redirect to write only a
  byte at a time and verified there are no errors, and no dropped data.
- Used debuggerd and debuggerd64 to dump 32 bit and 64 bit processes
  seemlessly.
- Used debuggerd on a 32 bit system to dump native stacks.

Bug: https://code.google.com/p/android/issues/detail?id=97024
Change-Id: Ie01945153bdc1c4ded696c7334b61d58575314d1
2015-01-20 17:22:07 -08:00
Elliott Hughes
bb604524fb am 45c4c06f: Merge "Remove unused cruft from libcutils."
* commit '45c4c06ffe6f38e0f77f37f488e07f2537eddd45':
  Remove unused cruft from libcutils.
2015-01-16 16:02:24 +00:00
Jeff Sharkey
7c42c7f84f am 9f72ef89: Merge "Extend to receive NFLOG packets."
* commit '9f72ef8944a93bd333c6c7f87c7f7d79207ae663':
  Extend to receive NFLOG packets.
2015-01-16 06:07:29 +00:00
Elliott Hughes
f21717cd87 Remove unused cruft from libcutils.
Change-Id: I316d39e8e0a9aa385d8e1f37678b8bf2c03441eb
2015-01-15 21:16:03 -08:00
Jeff Sharkey
9f72ef8944 Merge "Extend to receive NFLOG packets." 2015-01-16 01:11:02 +00:00
Christopher Ferris
fa41e0f5c8 Add timed versions of stack dumping functions.
Under some unknown circumstances, debuggerd could become unresponsive.
If you try and take a bugreport during this time, it will hang forever.
Adding functions that have a timeout will allow dumpstate to stop if
dumping is taking too long.

Bug: 18766581

(cherry picked from commit 5f2ff6a910)

Change-Id: I39e8e9c60209e3ef9efac795fedb8e1edce2bd3e
2015-01-15 15:34:21 -08:00
Dmitry Shmidt
2901b30a58 am 70f6dea9: Merge "android_filesystem: Remove setuid bits from tcpdump" into lmp-mr1-dev
* commit '70f6dea9d06876bc65181c40ee9e623be196fb4c':
  android_filesystem: Remove setuid bits from tcpdump
2015-01-15 20:51:35 +00:00
Jeff Sharkey
9a20e67fa6 Extend to receive NFLOG packets.
Packets captured and logged by the NFLOG target are unicast, so
extend to catch and decode them.  To avoid escaping issues, the raw
contents are passed around as hex strings.

Bug: 18335678
Change-Id: Ib7299500baa00080a1f000f9da843eb527363353
2015-01-15 12:50:59 -08:00
Dmitry Shmidt
70f6dea9d0 Merge "android_filesystem: Remove setuid bits from tcpdump" into lmp-mr1-dev 2015-01-15 20:45:06 +00:00
Dmitry Shmidt
33e4f4d81a android_filesystem: Remove setuid bits from tcpdump
Bug: 18669116

Change-Id: I25486f2fe0e994f569b788fc9f03ef6d383f54d4
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2015-01-15 10:35:54 -08:00
Christopher Ferris
844c7ccc0a am 5f2ff6a9: Add timed versions of stack dumping functions.
* commit '5f2ff6a9106083e2a79b8600a0bf6a5341c6ca38':
  Add timed versions of stack dumping functions.
2015-01-15 01:48:27 +00:00
Christopher Ferris
5f2ff6a910 Add timed versions of stack dumping functions.
Under some unknown circumstances, debuggerd could become unresponsive.
If you try and take a bugreport during this time, it will hang forever.
Adding functions that have a timeout will allow dumpstate to stop if
dumping is taking too long.

Bug: 18766581
Change-Id: I85053b8dcfe6224e2b64b4d8f7f2ef448b3cda34
2015-01-14 15:24:33 -08:00
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
Calin Juravle
1402fbb135 Handle code_cache dir creation in libnativebridge
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 f9d9e2a2d9)

Change-Id: I9ce578949dbe522d5033465df7ca49fdd3aa3cbf
2014-10-27 15:37:32 +00:00
Calin Juravle
f9d9e2a2d9 Handle code_cache dir creation in libnativebridge
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
2014-10-27 15:03:13 +00:00
Chih-Hung Hsieh
6ea35520fd am 07f1300c: am 7979f1ce: Merge "Do not inline rarely used trace function bodies."
* commit '07f1300c4c4f7d3c0df540bf8df3443c3f4539cd':
  Do not inline rarely used trace function bodies.
2014-10-15 17:57:07 +00:00
Chih-Hung Hsieh
c37387a4cd am 07f1300c: am 7979f1ce: Merge "Do not inline rarely used trace function bodies."
* commit '07f1300c4c4f7d3c0df540bf8df3443c3f4539cd':
  Do not inline rarely used trace function bodies.
2014-10-15 17:57:07 +00:00
Chih-Hung Hsieh
2d3150e736 Do not inline rarely used trace function bodies.
When atrace_* functions are inlined,
the rarely used 1024-byte buffers are allocated on stack.

BUG: 17444504
Change-Id: I773512aeb70e8b79f3803c6d59cba064d2aa65b6
2014-10-14 15:37:20 -07:00
Carson Liao
519d1cf44a am 4b0374ae: am 4c4cf467: modified AUDIO_SOURCE_FM_TUNER enum value for FM feature
* commit '4b0374ae1a97cff279f287dded14619e9579da62':
  modified AUDIO_SOURCE_FM_TUNER enum value for FM feature
2014-10-07 17:06:04 +00:00
Carson Liao
4c4cf467f5 modified AUDIO_SOURCE_FM_TUNER enum value for FM feature
Review: https://partner-android-review.git.corp.google.com/#/c/183993

    Signed-off-by: Carson Liao <carson.liao@mediatek.com>

Change-Id: I8d70b197bcdc710119031bcf622fee0c1b3b3aa7
2014-10-06 22:02:37 -07:00
Hans Boehm
f381920b58 am 072877af: am 41198eea: Merge "Revert "Rewrite atomic.h to use stdatomic.h.""
* commit '072877af485d49f11e227c0d22a7bb4a341533d6':
  Revert "Rewrite atomic.h to use stdatomic.h."
2014-10-04 02:17:43 +00:00
Hans Boehm
054627df6b am 072877af: am 41198eea: Merge "Revert "Rewrite atomic.h to use stdatomic.h.""
* commit '072877af485d49f11e227c0d22a7bb4a341533d6':
  Revert "Rewrite atomic.h to use stdatomic.h."
2014-10-04 02:09:19 +00:00
Hans Boehm
2789faabfa Revert "Rewrite atomic.h to use stdatomic.h."
This reverts commit cb344d4640.

Change-Id: Ib17cd8d00695062177ce863cedc4ec7148012317
2014-10-04 00:49:06 +00:00
Hans Boehm
954fc61b6b am f5204549: am 028928fe: Merge "Rewrite atomic.h to use stdatomic.h."
* commit 'f5204549faf7310cc808bcb3676fb36268178e26':
  Rewrite atomic.h to use stdatomic.h.
2014-10-04 00:06:45 +00:00