Commit graph

1615 commits

Author SHA1 Message Date
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
Mark Salyzyn
811f2c0b98 Merge "system/window.h: add deprecation warnings" 2014-05-28 19:25:15 +00:00
Torne (Richard Coles)
f9ff246dd7 am 4f3ad823: am a8329a36: am 96109cf3: Merge "Add UID and directory for RELRO sharing support."
* commit '4f3ad823eaf97fcbcbb1afac67371aff76677b1d':
  Add UID and directory for RELRO sharing support.
2014-05-28 18:02:24 +00:00
Torne (Richard Coles)
4f3ad823ea am a8329a36: am 96109cf3: Merge "Add UID and directory for RELRO sharing support."
* commit 'a8329a36ca0e5f5799ec2dd14ae360dc0656b9c9':
  Add UID and directory for RELRO sharing support.
2014-05-28 10:20:55 +00:00