Commit Graph

1618 Commits

Author SHA1 Message Date
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
Hans Boehm 2ac8207e50 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:30 +00:00
Hans Boehm cb344d4640 Rewrite atomic.h to use stdatomic.h.
Replace atomic-inl.h with a file that just includes atomic.h.
Remove platform specific implementations.

Change-Id: If16d74fbe0af7836ed8c1296c17e13a2d0d20f64
2014-10-01 17:37:20 -07:00
jgu21 2d83ca4cc1 am b3facbfd: LibNativeBridge: Add early init & env setup
* commit 'b3facbfdecf46eb7c063b99529ab8c18a08a6b42':
  LibNativeBridge: Add early init & env setup
2014-09-29 03:37:07 +00:00
jgu21 b3facbfdec LibNativeBridge: Add early init & env setup
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 962eb40abb)
(cherry picked from commit ab0da5a9a6)
(cherry picked from commit 2f71cb24fa)
(cherry picked from commit 04054e28e2)
(cherry picked from commit 4390a63236)

Bug: 17671501
Change-Id: Id4f4127d82737b5e56a77175e1068ff5cea60f9d
2014-09-26 13:04:36 -07:00
Hochi Huang 54d5b2e670 am fcbb23ad: [AU] Update volume setting and Audio Device API 3.0
* commit 'fcbb23adc939dd27122d962e5f7e7f016259f03e':
  [AU] Update volume setting and Audio Device API 3.0
2014-09-26 00:24:11 +00:00
Hochi Huang fcbb23adc9 [AU] Update volume setting and Audio Device API 3.0
Signed-off-by: Hochi Huang <hochi.huang@mediatek.com>
Change-Id: I772584ae05e6a8d2fdc8c4a52e44ad80c3c1a4a7
2014-09-25 21:26:02 +00:00
Andreas Gampe 69974972be resolved conflicts for merge of 64884bb1 to lmp-mr1-dev-plus-aosp 2014-09-24 16:00:12 -07:00
Andreas Gampe 2a0f42b58d resolved conflicts for merge of 64884bb1 to lmp-dev-plus-aosp 2014-09-24 15:56:29 -07:00
Andreas Gampe 9d1b922725 Merge "LibNativeBridge: Add early init & env setup" 2014-09-24 22:00:06 +00:00
Eric Laurent 4c58d89452 am 62e05407: am f6cce347: audio: add HW hotword capture flag
* commit '62e05407da5c36b6c4057e613ae6d4e3068a3721':
  audio: add HW hotword capture flag
2014-09-24 04:19:16 +00:00
jgu21 ab0da5a9a6 LibNativeBridge: Add early init & env setup
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.

Change-Id: I0b93da93251c6b4638de786bf98cf99df07c3fc2
2014-09-23 20:08:25 -07:00
Eric Laurent e6b10121ad am f6cce347: audio: add HW hotword capture flag
* commit 'f6cce347a73e3b3da9ff6698ead25b5a543ce47b':
  audio: add HW hotword capture flag
2014-09-24 02:26:33 +00:00
Elliott Hughes ed561793f3 am fbb4188c: am d559d6c7: Merge "defined(HAVE_OFF_T) is really just !defined(__APPLE__)."
* commit 'fbb4188cfac18b457801cf3e304bfa39dd29dde8':
  defined(HAVE_OFF_T) is really just !defined(__APPLE__).
2014-09-23 16:05:52 +00:00
Elliott Hughes 830b77bc5c am fbb4188c: am d559d6c7: Merge "defined(HAVE_OFF_T) is really just !defined(__APPLE__)."
* commit 'fbb4188cfac18b457801cf3e304bfa39dd29dde8':
  defined(HAVE_OFF_T) is really just !defined(__APPLE__).
2014-09-23 16:05:18 +00:00
Elliott Hughes cb3d65323d defined(HAVE_OFF_T) is really just !defined(__APPLE__).
Change-Id: I83c271bfe24b777acf293d2b4ac5af2cce8398b9
2014-09-22 20:50:54 -07:00
Eric Laurent f6cce347a7 audio: add HW hotword capture flag
Bug: 17575019.
Change-Id: I12c0a2e0200f3d839dfd74650724391e54ac3534
2014-09-19 17:45:18 -07:00
Christopher Ferris 6bcc4acc6f Use the correct debuggerd given the tid.
On 64 bit systems, calling dump_backtrace_to_file will automatically
call debuggerd64. If the process to dump is actually 32 bit, this
creates an unrecognizable dump backtrace. Modify the code to check the
type of the process and connect to the appropriate debuggerd process.

This change refactors both the tombstone and backtrace functionality to
allow both to work properly on 64 bit systems when dealing with mixed
processes.

Bug: 17487122

(cherry picked from commit a9fa7b87f1)

Change-Id: I3c9e0212c8720877a6af092071a3695df2a36df8
2014-09-13 16:22:17 -07:00
Christopher Ferris 07bb3f1e0b am 07dda6b5: Merge "Use the correct debuggerd given the tid." into lmp-dev
* commit '07dda6b57c6a476177b68ad42966f24cbbdb04c1':
  Use the correct debuggerd given the tid.
2014-09-13 22:54:00 +00:00
Christopher Ferris a9fa7b87f1 Use the correct debuggerd given the tid.
On 64 bit systems, calling dump_backtrace_to_file will automatically
call debuggerd64. If the process to dump is actually 32 bit, this
creates an unrecognizable dump backtrace. Modify the code to check the
type of the process and connect to the appropriate debuggerd process.

This change refactors both the tombstone and backtrace functionality to
allow both to work properly on 64 bit systems when dealing with mixed
processes.

Bug: 17487122
Change-Id: Icf123a6f4508b1aeec073663aa1a0ceae5380aa1
2014-09-12 20:12:11 -07:00
Mark Salyzyn abc75368a8 am e70851f8: am f9b9693b: Merge "liblog: logcat: colored output."
* commit 'e70851f8a8aa4c9dfaa442abf812c283ba8d8b6f':
  liblog: logcat: colored output.
2014-09-12 20:08:47 +00:00
Pierre Zurek ead88fca6e liblog: logcat: colored output.
This patch adds a new '-v color' option to logcat so that the output is
colored similar to the ones in DDMS. Simply type "adb logcat -v color"
to use it. Works well with bash in gnome-terminal. NO GUARANTEE IT WILL
WORK ON A NON xterm STYLE TERMINAL.

Signed-off-by: Michael Zimmermann <sigmaepsilon92@gmail.com>
Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Change-Id: I9189c5f27fed991579edbcbc6834536eb8112152
2014-09-11 19:04:17 -07:00
Jon Eklund 5c9f25da9c am fcfa8640: audio.h: Add "safe speaker" device for limited-loudness use cases
* commit 'fcfa86403e206e2caa519299939480cb45deb8ba':
  audio.h: Add "safe speaker" device for limited-loudness use cases
2014-09-11 18:30:51 +00:00
Jon Eklund fcfa86403e audio.h: Add "safe speaker" device for limited-loudness use cases
Bug: 17319721
Change-Id: Ie1af5b73258f8a0009c3bc3cecb3e0e8b2262ed7
2014-09-10 15:51:48 -07:00
Sreeram Ramachandran 18d5aa4d5a am 69052994: Merge "Support resetting connections tied to any nonexistent address." into lmp-dev
* commit '69052994fd21f2b594295f62e2f867e911e8468d':
  Support resetting connections tied to any nonexistent address.
2014-09-10 00:51:22 +00:00
Sreeram Ramachandran 69052994fd Merge "Support resetting connections tied to any nonexistent address." into lmp-dev 2014-09-09 23:24:45 +00:00
Sreeram Ramachandran 17622d09d5 Support resetting connections tied to any nonexistent address.
Bug: 15414453
Change-Id: Ibf1f052e12b88838a328148e25817a96f10d50f5
2014-09-08 23:35:52 -07:00
Andreas Gampe 41df668c7b NativeBridge: Refactor for new initialization flow
Setup becomes Load, have explicit Initialize and Unload.

(cherry picked from commit 035bd7541e)

Change-Id: I5a20de1cb68dd1802937b369b14c50c9c1031c67
2014-09-08 11:12:13 -07:00
Andreas Gampe 4f65030e0c am 8e10bfd9: am 88d1bc0e: Merge "NativeBridge: Refactor for new initialization flow"
* commit '8e10bfd9cc543fdec8fec26c320f649f72b15e3b':
  NativeBridge: Refactor for new initialization flow
2014-09-04 23:22:29 +00:00
Andreas Gampe 035bd7541e NativeBridge: Refactor for new initialization flow
Setup becomes Load, have explicit Initialize and Unload.

Change-Id: I5a20de1cb68dd1802937b369b14c50c9c1031c67
2014-09-04 12:57:54 -07:00
Hans Boehm cad56b6ad3 Remove android_... store_barriers and 64-bit atomics.
These are no longer used, and we want to strongly discourage future use.
Keep the 32-bit variants while there are still uses.  All users should move
to C11 or C++11 atomics.

(Resolved conflicts in atomic-...64.h with uniprocessor support
removal as in AOSP.)

Bug:16880454

Change-Id: I122b541cfd29ef4a6c932647f85d0d6a9d802061
(cherry picked from commit 9959ed9530)
2014-09-02 17:08:38 -07:00
Brian Carlstrom 68e0d185f4 am 24d2adba: am 188d4396: Merge "Change /dalvik-cache to be owned by root."
* commit '24d2adba7a2f9caa82a88be70ad2fe7397ab310a':
  Change /dalvik-cache to be owned by root.
2014-08-29 11:39:17 +00:00
Alex Light c692410e16 Change /dalvik-cache to be owned by root.
Bug: 16875245

(cherry picked from commit 3878ebd724)

Change-Id: I29a70215a2207bc4e0db02ab751d32a68edf4b66
2014-08-28 16:56:36 -07:00
Brian Carlstrom 188d4396b8 Merge "Change /dalvik-cache to be owned by root." 2014-08-28 23:17:06 +00:00
Alex Light 3878ebd724 Change /dalvik-cache to be owned by root.
Bug: 16875245

Change-Id: I29a70215a2207bc4e0db02ab751d32a68edf4b66
2014-08-27 15:42:19 -07:00
Hans Boehm d034eb1171 am 424eaece: am 69001e08: Merge "Remove android_... store_barriers and 64-bit atomics."
* commit '424eaece64e3649082a3972a8eebf76a6b403494':
  Remove android_... store_barriers and 64-bit atomics.
2014-08-27 22:09:03 +00:00
Hans Boehm 9959ed9530 Remove android_... store_barriers and 64-bit atomics.
These are no longer used, and we want to strongly discourage future use.
Keep the 32-bit variants while there are still uses.  All users should move
to C11 or C++11 atomics.

Change-Id: I122b541cfd29ef4a6c932647f85d0d6a9d802061
2014-08-27 14:15:09 -07:00
Andreas Gampe 049249ce7a NativeBridge: Tighten security on libnativebridge
Do not allow arbitrary paths for the native bridge - only allow
simple names.

Do not allow re-setup of the native bridge.

Bug: 16404669

(cherry picked from commit cd2ef4c1af)

Change-Id: Ie22de356d2307fe2758f9094a85d44e61a4098a1
2014-08-22 01:44:06 -07:00
Andreas Gampe c029f9d225 am 4089cda0: Merge "NativeBridge: Tighten security on libnativebridge" into lmp-dev
* commit '4089cda0ae73e71adb787e595c747846e30730ee':
  NativeBridge: Tighten security on libnativebridge
2014-08-22 05:13:50 +00:00
Andreas Gampe cd2ef4c1af NativeBridge: Tighten security on libnativebridge
Do not allow arbitrary paths for the native bridge - only allow
simple names.

Do not allow re-setup of the native bridge.

Bug: 16404669
Change-Id: Ie22de356d2307fe2758f9094a85d44e61a4098a1
2014-08-21 14:33:44 -07:00
Elliott Hughes 176fe9005d am 4592d73e: am a59b6ac6: Merge "Only the Mac doesn\'t have open_memstream."
* commit '4592d73e18684b8ba2addb97433eed4cf389e386':
  Only the Mac doesn't have open_memstream.
2014-08-21 03:16:26 +00:00
Elliott Hughes a59b6ac697 Merge "Only the Mac doesn't have open_memstream." 2014-08-21 00:11:41 +00:00
Elliott Hughes 3ff8888f66 Only the Mac doesn't have open_memstream.
We should probably move this into art, since they're the only people using it.

Bug: 17164505
Change-Id: I67b8f0cbad4c6368d4424e6979d6b044dd36aa37
2014-08-20 16:16:24 -07:00
Elliott Hughes 3601abb810 am f7e88e51: am 373c7758: Merge "There\'s no non-SMP LP64."
* commit 'f7e88e51b31e64e085b3a564f4b1baa8334d63f1':
  There's no non-SMP LP64.
2014-08-20 20:49:36 +00:00
Elliott Hughes 901c900ce6 There's no non-SMP LP64.
Bug: 17108682
Change-Id: I7e44ab48b5cacf989333882ffe67f39e9b0ce843
2014-08-20 13:05:55 -07:00
Elliott Hughes 10cce72c4b am 3859029a: am 7fb0ee0c: Merge "Remove androidGetTid."
* commit '3859029a48aa78150fa61eb4988214f8632b33ce':
  Remove androidGetTid.
2014-08-18 19:34:23 +00:00
Piotr Jastrzebski c77755f139 am f81da073: am c0879ee9: Merge "Replace char* with ZipEntryName in ziparchive API."
* commit 'f81da073dab8c6eba0a86975f4d94eae5dc461cf':
  Replace char* with ZipEntryName in ziparchive API.
2014-08-18 09:13:07 +00:00
Piotr Jastrzebski c0879ee9d3 Merge "Replace char* with ZipEntryName in ziparchive API." 2014-08-16 04:31:31 +00:00
Elliott Hughes b7659613b2 Remove androidGetTid.
Bug: 17048545
Change-Id: I93cbb2d7bd18d506b5f5f7f262dd9ac0fca053b4
2014-08-18 10:47:37 -07:00
Jeff Brown 84a248ce27 am 69d68b69: Merge "Add trace tag for power management." into lmp-dev
* commit '69d68b69e5341124c1947f3110c67aa8836e3437':
  Add trace tag for power management.
2014-08-16 03:14:32 +00:00
Jeff Brown 69d68b69e5 Merge "Add trace tag for power management." into lmp-dev 2014-08-15 18:45:09 +00:00
Calin Juravle 62de21e148 am 5ed25acd: am 25a7d5f8: Merge "Move native bridge library in system/core"
* commit '5ed25acd4ab7c606986c77892c07c2914f8df8f2':
  Move native bridge library in system/core
2014-08-15 12:42:36 +00:00
Piotr Jastrzebski ecccc5ad93 Replace char* with ZipEntryName in ziparchive API.
It's important because entry names can be encoded in UTF-8 and can have \0
character in the middle.
Use vector instead of char* for prefix in IterationHandle.

Bug: 16162465
Change-Id: Ie34c8d7c6231cc258530c22bdde5542895213649
2014-08-15 12:39:45 +01:00
Calin Juravle 4914fcd91b Move native bridge library in system/core
Bug: 16884833

(cherry picked from commit 961ae12dea)

Change-Id: I67f037ea81d2a4ede4294afd8b84b7640e534a13
2014-08-15 12:40:45 +01:00
Calin Juravle 25a7d5f892 Merge "Move native bridge library in system/core" 2014-08-15 04:45:59 +00:00
Jeff Brown de4d921192 Add trace tag for power management.
Bug: 17004602
Change-Id: Iecd79e6e0417c02b902cde468b0e842f9348b386
2014-08-14 19:24:30 -07:00
Piotr Jastrzebski d5d04be07f am fa412127: am b242ad40: Merge "Revert "Make sure that names of all entries have the same encoding.""
* commit 'fa41212789a068827edc9fd1eac7b6a988cba0a5':
  Revert "Make sure that names of all entries have the same encoding."
2014-08-13 10:02:23 +00:00
Piotr Jastrzebski 8b4a58e1df am b720c8d6: am b0206765: Merge "Make sure that names of all entries have the same encoding."
* commit 'b720c8d601cebbc9f48ef8e51c23fd6d190305f7':
  Make sure that names of all entries have the same encoding.
2014-08-13 09:09:36 +00:00
Calin Juravle 961ae12dea Move native bridge library in system/core
Bug: 16884833

Change-Id: I73aab8e212860ba5aee9444d801806d3da326a41
2014-08-12 22:39:25 +01:00
Piotr Jastrzebski bd0a74854e Revert "Make sure that names of all entries have the same encoding."
This reverts commit 6a7f4bb79d.

Change-Id: Id4f5b601ff0b9d82ce2c9beeb9162eba9594b3a7
2014-08-13 09:49:25 +00:00
Piotr Jastrzebski 6a7f4bb79d Make sure that names of all entries have the same encoding.
Add new public method to allow checkisc if an archive has entry names encoded in
UTF-8. If not then they will be encoded in IBM PC character encoding.

Bug: 16162465
Change-Id: I4468d76accca8a9b0b31cae8d43399ffc22cad42
2014-08-13 09:58:16 +01:00
Piotr Jastrzebski 6a993053c8 am 6871f937: am 400e7372: Merge "Add EndIteration method to free memory allocated"
* commit '6871f937f93c2a37344b928203ec613559584d33':
  Add EndIteration method to free memory allocated
2014-08-11 09:57:52 +00:00
Rachad 9cf963d61e am cc2566f1: Merge "Tunneled Video Playback support" into lmp-dev
* commit 'cc2566f12760d66837b52213e5ffd2cb30cce19e':
  Tunneled Video Playback support
2014-08-09 05:07:13 +00:00
Rachad cc2566f127 Merge "Tunneled Video Playback support" into lmp-dev 2014-08-09 00:51:24 +00:00
Piotr Jastrzebski 79c8b34f36 Add EndIteration method to free memory allocated
in StartIteration. This method should always be called when the
iteration is over to make sure that we don't leak memory.

Change-Id: I5205c754dfafbab9bb5f06003c3663d2ec4e8a35
2014-08-11 07:58:00 +01:00
Elliott Hughes aab3b34cd7 am 4c818dc8: am 56b28f6b: Merge "RefBase: make Renamer destructor virtual"
* commit '4c818dc800d97e2fdee0337a0e9736099d90cc47':
  RefBase: make Renamer destructor virtual
2014-08-06 22:48:30 +00:00
Eric Laurent c85cce96af am fb2343da: Merge "audio: add defines for audio HW sync source" into lmp-dev
* commit 'fb2343da60bdf56205a29ec11db5e3bdd87d9651':
  audio: add defines for audio HW sync source
2014-08-06 20:30:22 +00:00
Eric Laurent d91e6df901 audio: add defines for audio HW sync source
Bug: 16132368.
Change-Id: I4008c315f2cba9c6027998be92f4af649359bcce
2014-08-05 15:02:57 -07:00
Elliott Hughes a613844e13 am e07a6e63: am 6d9a5ac3: Merge "[MIPSR6] Skip pixelflinger, memset assembler code on mips32r6"
* commit 'e07a6e6337a959c45ab71acf6ff1fad8a8ac5dfd':
  [MIPSR6] Skip pixelflinger, memset assembler code on mips32r6
2014-08-05 21:43:16 +00:00
Eric Laurent 3b1215c374 Merge "sound_trigger HAL update" into lmp-dev 2014-08-05 17:41:31 +00:00
Elliott Hughes 6d9a5ac394 Merge "[MIPSR6] Skip pixelflinger, memset assembler code on mips32r6" 2014-08-05 17:41:26 +00:00
Christopher Ferris dda47b7868 Allow getting an uncached process map.
(cherry picked from commit f02593b0e6)

Change-Id: I2012bf2dc553ebc663345b9eac6d794e80df9c00
2014-08-04 19:21:23 -07:00
Elliott Hughes 56b28f6b2c Merge "RefBase: make Renamer destructor virtual" 2014-08-05 00:30:25 +00:00
Ukri Niemimuukko 00e56a248d RefBase: make Renamer destructor virtual
This patch makes the Renamer class destructor virtual and fixes
the incorrect constructor initialization list ordering.

These issues and related compiler warnings have been suppressed
by the build system which uses the gcc –isystem command
line option, unless a project explicitly adds the include the path
system/core/include to Android.mk and uses the templates.

Change-Id: Iff76a655eb8bd547adfe994c7315a005e98aed41
Signed-off-by: Ukri Niemimuukko <ukri.niemimuukko@intel.com>
Signed-off-by: Mingwei Shi <mingwei.shi@intel.com>
Signed-off-by: Yong Yao <yong.yao@intel.com>
2014-08-06 00:12:06 -07:00
Christopher Ferris f02593b0e6 Allow getting an uncached process map.
Change-Id: I58d7e90a7b5c4476a4b9f51640c54d13748ac220
2014-08-04 17:17:57 -07:00
Rachad d6d4c61a93 Tunneled Video Playback support
Added native_window_set_sideband_stream() method to window.h

Bug: 16132368
Change-Id: Iff5770cb2e2d27176bee37edacaed7b783bbce2a
2014-08-04 21:57:37 +00:00
Eric Laurent 3fc434e9c1 sound_trigger HAL update
Indicate if trigger capture is returned with
recognition event in implementation properties
Add coarse confidence level to keyphrase recognition event.
Add capture format to recognition event

Bug: 12378680.

Change-Id: I52303ce2e46b9ebfb9993e47d153799921f9f8e7
2014-08-03 17:52:10 -07:00
Duane Sand 734f50c2fe [MIPSR6] Skip pixelflinger, memset assembler code on mips32r6
Temporarily use generic C-coded libpixelflinger & memset on mips32r6.

Change-Id: I629b11ba955eaba323cba1df96c39f75f4d24d62
2014-07-31 16:21:16 -07:00
Eric Laurent 1e92ed5e83 audio: define type for unique audio Ids.
Define a type for unique audio Ids allocated by AudioFLinger
for use as session Ids or I/O handles.

Bug: 12378680.
Change-Id: Ic9019fff97a1227b60e48c88c57d25dbbdcd7d1e
2014-07-28 14:31:58 -07:00
Eric Laurent a768c306b2 audio: add audio device address helper function
Add helper function to derive set_parameter command
string from device type and address.

14815883

Change-Id: Icf47218f1809f567ef93bdd99d6308475886b298
2014-07-28 19:24:50 +00:00
Eric Laurent 0a381a379d audio: move struct audio_config definition to audio.h
struct audio_config definition moved from hardware/audio.h to
system/audio.h for use inside the framework and not only at the HAL.

Added frame_count field to struct audio_config.

Bug: 14815883.

Change-Id: Ib0e99a60234b8e5302eb882b89e5a021a94ec2cb
2014-07-28 19:18:39 +00:00
Jean-Michel Trivi c3dbe121be Define new audio attribute flag: beacon
Flag AUDIO_FLAG_BEACON characterizes streams where the system
  ensures that the playback of the sound will be compatible
  with its use as a broadcast for surrounding people
  and/or devices. Ensures audibility with no or minimal
  post-processing applied.

Bug 15415971

Change-Id: I1df9dc50e3fcc973a0709a55df5b3bd95f81eb58
2014-07-27 14:09:00 -07:00
Zhijun He c73b73a3c9 graphics: update raw10 to allow padding between rows
Change-Id: Ied1f42bb977212d9e5f3b2b2b3caa9c8c2caac5d
2014-07-25 11:42:38 -07:00
Elliott Hughes 2befa73f68 Remove <cutils/tztime.h>.
(cherry picked from commit f2e4b411e6)

Bug: 15765976
Change-Id: I758acdb18d75ea601a06d02b53f1df9f1ad17a26
2014-07-24 16:16:59 -07:00
Elliott Hughes f2e4b411e6 Remove <cutils/tztime.h>.
Change-Id: I043c6686361bda9e85b82408511bf241a42b9229
2014-07-24 16:13:39 -07:00
Sreeram Ramachandran eec232603d Put back some deleted code.
http://ag/507249 removed a bunch of supposedly dead (unused) code. It turns out
at least ifc_disable() is being used in some protected partner branches. Put
back that as well as ifc_enable() to keep it symmetric.

Bug: 15413389
Change-Id: Ibec83a66e5d9079876ccf36d250b95b7c0294c03
2014-07-23 09:30:53 -07:00
Sreeram Ramachandran a723689eca Cleanup: Delete dead code.
Bug: 15413389
Change-Id: I315468832ef18ffc84174e54774ab63b86d284dc
2014-07-22 15:00:21 -07:00
Hans Boehm b14f65cb50 Do not typedef char16_t if it is a keyword.
Don't define char16_t on platforms where char16_t is a keyword, as
C11 and C++11 define it to be.

(cherry picked from commit dfdbe61d28)
Change-Id: I6717bc2133c1363ecd85861f3869e1eabd2ce96a
2014-07-18 17:53:02 -07:00
Hans Boehm dfdbe61d28 Do not typedef char16_t if it is a keyword.
Don't define char16_t on platforms where char16_t is a keyword, as
C11 and C++11 define it to be.

Change-Id: I6717bc2133c1363ecd85861f3869e1eabd2ce96a
2014-07-16 16:09:37 -07:00
Jungshik Jang cadd5bb70e Add force usage and config type for HDMI-CEC system audio mode.
New Usage Type: AUDIO_POLICY_FORCE_FOR_HDMI_SYSTEM_AUDIO
New Config Type: AUDIO_POLICY_FORCE_HDMI_SYSTEM_AUDIO_ENFORCED
When HDMI-CEC system audio mode is enabled, AudioService will
call
 setForceUse(AUDIO_POLICY_FORCE_FOR_HDMI_SYSTEM_AUDIO,
          AUDIO_POLICY_FORCE_HDMI_SYSTEM_AUDIO_ENFORCED);
in order to notify enabled system audio mode, so that
audio policy manager chooses proper output.
When it turns into off, AudioService will call
 setForceUse(AUDIO_POLICY_FORCE_FOR_HDMI_SYSTEM_AUDIO,
          AUDIO_POLICY_FORCE_NONE);

Along with it, add new audio output devic type,
AUDIO_DEVICE_OUT_AUX_LINE, in order to distinguish
line out for headphone and aux output of av device.

Bug: 16305986
Bug: 16002150
Change-Id: Idecdf626737f6635ea3cda638c343260b1661c77
2014-07-16 09:21:04 +09:00
Ruben Brunk a5e65d86a2 Allow sticky transform to be set in ANativeWindow.
Bug: 15116722

- Adds methods to set the sticky transform field.

Change-Id: Idaa4311dfd027b2d2b8ea5e2c6cba2da5779d753
2014-07-14 22:14:49 +00:00
Hans Boehm 5af7877950 Add comment to discourage use of cutils/atomic.h.
Change-Id: Ib05c745158fdf5a11fd4697c3665a6370ffc04f5
2014-07-11 18:30:13 -07:00
Glenn Kasten e60eb62384 Merge "Representation of channel masks for position assignment and index assignment" 2014-07-11 16:34:41 +00:00
Hans Boehm 4b9f899bf1 am e6b0c566: am 981dcd79: Merge "Add comment to discourage use of cutils/atomic.h."
* commit 'e6b0c566762dbea1c45198d15ecc5e8a59378d73':
  Add comment to discourage use of cutils/atomic.h.
2014-07-12 19:36:58 +00:00
Glenn Kasten 432b7c6da2 Representation of channel masks for position assignment and index assignment
Bug: 16245854
Change-Id: I76c7c39c7d4f8d5035016653aa91fa7c1e749bbd
2014-07-12 13:23:57 +00:00
aarti jadhav-gaikwad 923e740879 audio: add definitions for aac sub formats
add definitions for aac sub formats

Change-Id: I610caa510dfc7347f7c98e19359545423edd76b3
2014-07-11 18:26:00 +00:00
Jungshik Jang 6fe316102a Merge "Fix size of "values" fields of audio_gain_config." 2014-07-10 21:52:20 +00:00
Jungshik Jang f7e5aeadb7 Fix size of "values" fields of audio_gain_config.
It should be sizeof(audio_channel_mask_t) * 8 not
sizeof(audio_channel_mask_t) alone.

Change-Id: I3523dd4d44a0900ba1845b3675a22451f1fc2f3c
2014-07-11 03:37:42 +00:00
Jungshik Jang 2c7cfc10f5 Remove forced usage types for HDMI-CEC system audio mode.
Change-Id: Ice8aab76281aa62a42665d7c86df1041c7f64ab9
2014-07-11 03:36:28 +00:00
Terry Heo a916e260db Merge "audio: add definition for new audio loopback input device" 2014-07-02 19:52:36 +00:00
Terry Heo b63dd8a005 audio: add definition for new audio loopback input device
Bug: 15437484
Change-Id: I62da0596d405c3bb5e00b461f7d4fd11627ed391
2014-07-08 14:52:51 +00:00
Eric Laurent 81c006d792 Revert "Revert "sound trigger: several data structure updates""
This reverts commit 6ef7c14b02.

Change-Id: I285b8388e7fd6f697b76fd18697edea7368991bb
2014-07-08 11:48:15 -07:00
Eric Laurent 6ef7c14b02 Revert "sound trigger: several data structure updates"
This reverts commit 135dd2ee3d.

Change-Id: Iad97090c77ad36567eb3c6550ebe3812768e88ad
2014-07-07 16:43:45 +00:00
Eric Laurent 135dd2ee3d sound trigger: several data structure updates
Added sound model implementor UUID.
Added capture preamble duration in recognition event.
Replaced number of users by list of user IDs in key phrase
descriptor.
Report confidence level for each user with user ID in recognition
event.
Added more configuration data to start_recognition() grouped in a
recognition configuration structure.
- List of keyphrases to listen to
- Recognition mode
- List of users with min confidence level
Added definitions for sound model load callback event.

Bug: 12378680.
Change-Id: Ia8c12ab20448b702d13db964bdd90ac4117a58d7
2014-07-06 16:03:42 -07:00
Eric Laurent db37858a17 sound trigger: add sound model and key phrase IDs.
Bug: 12378680.
Change-Id: I93b1916151108ccf6eb625b0078e6ed574720b76
2014-07-06 10:44:18 -07:00
Nick Kralevich 774ca89315 am ed559bdb: am 3dbd7e10: am 1aad06dd: Merge "implement LOG_EVENT_STRING"
* commit 'ed559bdb38e4f8edb183420f69490d4eba39f94b':
  implement LOG_EVENT_STRING
2014-07-02 23:13:43 +00:00
Nick Kralevich ed559bdb38 am 3dbd7e10: am 1aad06dd: Merge "implement LOG_EVENT_STRING"
* commit '3dbd7e10688e29022db7dd0778ec8078c2a7a545':
  implement LOG_EVENT_STRING
2014-07-02 18:25:32 +00:00
Nick Kralevich 2a4d05a4e3 implement LOG_EVENT_STRING
Implement LOG_EVENT_STRING, so that native code can create new
event log entries. This is needed to support logging SELinux denials
to the event log.

Change-Id: I6a269a832bc2f5e5da6c9dbd169ed2f901b49166
2014-07-01 12:22:04 -07:00
Jungshik Jang 0c3664f08d Define force usage and category for System Audio.
System Audio Control in HDMI-CEC delegates audio
output to Audio Receiver and audio output port
is one of ARC, SPDIF and analog output (line).

Change-Id: Ieb325f754f039e09aae68b700349861ca4e08cbc
2014-07-01 17:10:02 +09:00
Ian Rogers f267b06305 am 3e906630: am 33dce382: am 63a61e56: Merge "Rename __unused to __UNUSED for glibc support."
* commit '3e906630099e0508a72300e14512a62110c864c3':
  Rename __unused to __UNUSED for glibc support.
2014-06-29 23:14:09 +00:00
Ian Rogers 3e90663009 am 33dce382: am 63a61e56: Merge "Rename __unused to __UNUSED for glibc support."
* commit '33dce382fd39b633731c925a1487a74332e86871':
  Rename __unused to __UNUSED for glibc support.
2014-06-29 23:08:49 +00:00
Ian Rogers de8b983357 Rename __unused to __UNUSED for glibc support.
Glibc declares unused fields as __unused and so a #define for __unused causes
issues when we built against glibc on the host. Rename __unused to __UNUSED as
a workaround.
This fixed checkbuild for 64-bit host builds. Bug: 13751317

Change-Id: Ic2cd52518c16661497cc819cb3fd7f1fa5c6f0fb
2014-06-27 17:40:32 -07:00
Zhijun He 72fce30eeb graphics: add android raw10 format
Change-Id: Ib1b74b1664159190e417f2e68a5a13493d04adfc
2014-06-25 15:21:20 -07:00
Elliott Hughes 8e1f3f58e4 am 2c2fdae7: am 633be1f3: Merge "Remove android_atomic_swap from mips & mips64."
* commit '2c2fdae75490130b3df2c4989716381deaac0969':
  Remove android_atomic_swap from mips & mips64.
2014-06-23 20:20:13 +00:00
Elliott Hughes bad62c532c am ba467827: am 29705171: Merge "[MIPS64] add atomic-mips64"
* commit 'ba46782770743ad8331047fc839c4e98060d167c':
  [MIPS64] add atomic-mips64
2014-06-23 19:48:56 +00:00
Elliott Hughes e6d567bd10 am 8e1f3f58: am 2c2fdae7: am 633be1f3: Merge "Remove android_atomic_swap from mips & mips64."
* commit '8e1f3f58e41e97cb6cf131d8bcd75e3ad2e733ad':
  Remove android_atomic_swap from mips & mips64.
2014-06-23 20:25:20 +00:00
Elliott Hughes 7688ef0063 am bad62c53: am ba467827: am 29705171: Merge "[MIPS64] add atomic-mips64"
* commit 'bad62c532c8fabbada924c617d983fbfc94623e3':
  [MIPS64] add atomic-mips64
2014-06-23 19:54:10 +00:00
Elliott Hughes a74680fcc8 Remove android_atomic_swap from mips & mips64.
Looks like this got left behind in mips by mistake, and
84c3e99231 carried this over to mips64.
Clean up before it wastes any more time...

Change-Id: I6aeaa6e68be81f94065589337e2f7d3483e6e43c
2014-06-23 11:57:30 -07:00
Elliott Hughes 2970517132 Merge "[MIPS64] add atomic-mips64" 2014-06-23 14:50:49 +00:00
Riley Andrews 72f66d982a am 1fe97b3d: am 5bd578e1: Merge "cutils: Add property_get_bool, _get_int32, _get_int64"
* commit '1fe97b3d0f6dbc6376a0ebe1f66725e9f73b4442':
  cutils: Add property_get_bool, _get_int32, _get_int64
2014-06-20 22:40:40 +00:00
Igor Murashkin d8f2a8d34a cutils: Add property_get_bool, _get_int32, _get_int64
* Read out system properties with same syntax as SystemProperties.java
* Also adds unit test suite to validate correctness of properties
* Also fixes buffer overrun in property_get

(cherry picked from commit d4507e9246)

Change-Id: Ifd42911f93e17da09e6ff1298e8875e02f3b6608
2014-06-20 20:01:49 +00:00
Lorenzo Colitti 25af09e16d Merge "Support parsing netlink route messages." 2014-06-19 22:58:18 +00:00
Lorenzo Colitti d7ff7ea652 Support parsing netlink route messages.
Bug: 9180552
Change-Id: I4a36d869ac692647fb226d0912285bdf2ffcb1fa
2014-06-21 10:55:07 +09:00
Lorenzo Colitti 9b34293566 Improvements to netlink event parsing.
1. Accept that parseNetlinkMessage can only parse one netlink
   message, because its way of returning output is to modify its
   member variables (mAction, mParams, etc.). Currently, it
   loops through all the messages it finds, updating its member
   variables as it goes along, and always returns true at the end
   of the buffer. This has the following problems:

   1. Since the function always returns true even when no
      messages were parsed, the caller has no way to know if
      parsing succeeded, and we get lots of "No subsystem found
      in netlink event" logs if the buffer did not contain any
      valid messages we were interested in.
   2. If there are multiple messages in the buffer, all but the
      last message will be silently ignored.
   3. If there are multiple messages and previous messages have
      more parameters than the last one, the resulting event will
      have a mixture of parameters from multiple messages.

   Instead of doing all this, change the contract to "parse the
   first valid message of interest in the buffer and return true,
   or return false if there were no such messages", and update
   the code and the comments accordingly.

2. Modify the caller (NetlinkListener) so it doesn't log an
   error when parseBinaryNetlinkMessage returns false, because
   this can now simply mean that we weren't interested in that
   particular message. parseBinaryNetlinkMessage already logs
   more informative errors.

3. Provide utility functions to check received message lengths and
   to convert message types to message names.

4. Simplify logging duplicate attributes.

5. Use the appropriate IFLA_xxx macros instead of rolling our own
   code to parse link state messages.

6. Move all the parsing code out to per-message-type parsing
   functions to order to simplify parseBinaryNetlinkMessage.

Bug: 9180552
Change-Id: I6bbc2f7a104f618674dde2369c1fd5e93ea49430
2014-06-21 10:54:43 +09:00
Lorenzo Colitti 4937431a4b Merge "Improvements to netlink event parsing." 2014-06-19 22:58:18 +00:00
Eric Laurent ce30de3553 audio: added new audio formats.
Bug: 9428304.

Change-Id: Ife1f6968a8d079b477b5afb5e5cf544e8fe3298f
2014-06-19 09:55:54 -07:00
Mark Salyzyn e5fdfcdcb4 am 9b86360f: am c3e23666: am 7fa1cd19: Merge "log: Fix warning with __USE_MINGW_ANSI_STDIO"
* commit '9b86360fb41b46abfc0e475cfdea4370a93179d5':
  log: Fix warning with __USE_MINGW_ANSI_STDIO
2014-06-13 14:43:58 +00:00
Mark Salyzyn 9b86360fb4 am c3e23666: am 7fa1cd19: Merge "log: Fix warning with __USE_MINGW_ANSI_STDIO"
* commit 'c3e2366602c428cf39ce9068a834771f535d58b2':
  log: Fix warning with __USE_MINGW_ANSI_STDIO
2014-06-13 14:40:42 +00:00
Dan Willemsen 0cddcc67cc log: Fix warning with __USE_MINGW_ANSI_STDIO
I haven't seen this warning in any AOSP code, but some of our code is
using this header differently than the rest of the build system, and
hits this warning-turned-error:

error: "__USE_MINGW_ANSI_STDIO" is not defined [-Werror=undef]

Change-Id: I3c5a91f107af8bf6078e06f2ce326c5466349b79
2014-06-12 13:19:51 -07:00
Nick Kralevich b14ab71f0e am 0487e50a: am 24fc60c7: am 304d31f0: Merge "Make su 04750"
* commit '0487e50accf44f13acafad5fb5d76b4958d86550':
  Make su 04750
2014-06-11 20:24:20 +00:00
Nick Kralevich 0487e50acc am 24fc60c7: am 304d31f0: Merge "Make su 04750"
* commit '24fc60c7a686afb06a8a4a6246ede277ef300e50':
  Make su 04750
2014-06-10 20:26:31 +00:00
Jeff Brown 5ee915afe1 Add a couple of useful string functions.
Change-Id: I158f69917bab5f15482dd8f2b66b36a4cc0f11ad
2014-06-09 14:02:52 -07:00
Nick Kralevich c3df8d7562 Make su 04750
Currently, /system/xbin/su is world executable. Prior to SELinux
enforcement, anyone (including third party apps) could run su.
The su code itself checks to see if the calling UID is root or shell.

Rather than relying on enforcement within the su binary, modify the
binary so it has group=shell, and remove world-execute permission.
This helps avoid some annoying SELinux denial messages as third party
apps call su on userdebug/eng builds.

Change-Id: I61c9231bb7e201d14ee3a5b6fe81b3fa7b12599f
2014-06-08 15:14:42 -07:00
Robin Lee f086a8134c am 63cdd840: am e948c9fa: am 489797c2: Merge "Add new AID shared by all apps in a profile"
* commit '63cdd840f81839bf6ce6e3723c42f09256cf4b3e':
  Add new AID shared by all apps in a profile
2014-06-04 19:06:23 +00:00
Robin Lee 63cdd840f8 am e948c9fa: am 489797c2: Merge "Add new AID shared by all apps in a profile"
* commit 'e948c9faaa4861f578ebe00c8d2fabe7908e24a6':
  Add new AID shared by all apps in a profile
2014-06-04 19:04:12 +00:00
Robin Lee 489797c2cb Merge "Add new AID shared by all apps in a profile" 2014-06-04 18:45:02 +00:00
Andrew Hsieh 213fce951b am 4e3f28e7: am 7ab32aca: Merge "Use format(gnu_printf, ...) for windows build with __USE_MINGW_ANSI_STDIO"
* commit '4e3f28e748e0fe6e71d34a898c6a670621786200':
  Use format(gnu_printf, ...) for windows build with __USE_MINGW_ANSI_STDIO
2014-06-04 12:32:30 +00:00
Andrew Hsieh 4e3f28e748 am 7ab32aca: Merge "Use format(gnu_printf, ...) for windows build with __USE_MINGW_ANSI_STDIO"
* commit '7ab32aca56fe8df4575fc2e2e40ff7e1d38fca60':
  Use format(gnu_printf, ...) for windows build with __USE_MINGW_ANSI_STDIO
2014-06-04 12:27:05 +00:00
Andrew Hsieh 7ab32aca56 Merge "Use format(gnu_printf, ...) for windows build with __USE_MINGW_ANSI_STDIO" 2014-06-04 07:11:00 +00:00
Duane Sand 84c3e99231 [MIPS64] add atomic-mips64
Supplied by Broadcom.

Change-Id: Ica8f4f6e713623e372a68e1dc11086ceb52516da
2014-06-03 16:15:01 -07:00
Eric Laurent 5894b4bfaa add definitions for sound trigger
Add header file sound_trigger.h containing
base definitions and data types for sound
trigger native service and HAL.

Change-Id: Ie357d8c3909d0e1afda230523aded2d8699c69f1
2014-06-03 14:48:41 -07:00
Jean-Michel Trivi 0d580e83dd Define audio attributes type in system audio header
Change-Id: Iac2030a1e4a6827676e6c5f9b408f1e768207f00
2014-06-03 15:47:17 +00:00
Elliott Hughes 540a1849cb am b3697ec2: am c752d6dd: am bf082ffb: Merge "Updated trace.h to recognize ATRACE_TAG_BIONIC."
* commit 'b3697ec2cb75d4f13c22a54b0ef90f4e8fb46e02':
  Updated trace.h to recognize ATRACE_TAG_BIONIC.
2014-05-28 22:17:56 +00:00
Mike Lockwood 1142d8ecea Merge "audio: Add AUDIO_DEVICE_IN_BLUETOOTH_A2DP" 2014-05-28 21:53:41 +00:00
Elliott Hughes b3697ec2cb am c752d6dd: am bf082ffb: Merge "Updated trace.h to recognize ATRACE_TAG_BIONIC."
* commit 'c752d6dd37a943b2ef64c184a0ff542e78173bc9':
  Updated trace.h to recognize ATRACE_TAG_BIONIC.
2014-05-28 21:45:12 +00:00
Elliott Hughes bf082ffb71 Merge "Updated trace.h to recognize ATRACE_TAG_BIONIC." 2014-05-28 21:35:57 +00:00
Mike Lockwood c8183af4b3 audio: Add AUDIO_DEVICE_IN_BLUETOOTH_A2DP
Change-Id: I32770abd42702d99f409f0968326041e78d1a826
2014-05-28 13:47:25 -07:00
Mark Salyzyn f661a8f531 am 27348af6: am 6445b40e: am 811f2c0b: Merge "system/window.h: add deprecation warnings"
* commit '27348af683a55d8701567fdeabdd37b547b187f0':
  system/window.h: add deprecation warnings
2014-05-28 19:33:51 +00:00
Mark Salyzyn 27348af683 am 6445b40e: am 811f2c0b: Merge "system/window.h: add deprecation warnings"
* commit '6445b40e93931dedcb831f38343c031c13b7ddb2':
  system/window.h: add deprecation warnings
2014-05-28 19:31:06 +00:00