Commit graph

430 commits

Author SHA1 Message Date
Dianne Hackborn
6ff1bee167 Merge "Add AID_SDCARD_R." 2012-03-08 18:31:20 -08:00
Eric Laurent
b015977acb Merge "audio policy: added flag for primary output" 2012-03-08 15:45:23 -08:00
Dianne Hackborn
50458cf76e Add AID_SDCARD_R.
Change-Id: I47f650e415e06c0b69790ffefea7f208c910ebd7
2012-03-08 14:30:32 -08:00
Eric Laurent
11fd2beea0 audio policy: added flag for primary output
Added a flag for output stream attributes indicating a primary
audio output stream.
The primary audio output stream is unique on a platform and receives all volume,
routing and parameters related to telephony use case.

Change-Id: Ic50b3c02cc60805031f26b819da6cf9ad65ad11c
2012-03-08 13:18:20 -08:00
Selim Gurun
7bf4c45f84 Add a utility function to send a code + binary msg
Add a utility function to SocketClient to send a c-string code
prepended to a binary message. This is necessary to be able to
send a binary message while keeping compatible with underlying
text-based protocol.

Change-Id: Ifc6562003a687577d7deb50260533a5147ae4f97
2012-03-07 16:19:52 -08:00
Robert Greenwalt
78f6bcf853 Merge "New NativeDaemonConnector protocol adds a seqnum." 2012-03-06 11:30:13 -08:00
Mathias Agopian
b7286aa02e remove dependency on utils/List.h
Change-Id: I9a1e996be645520d1d5a056337303a6e5ed646e9
2012-03-05 17:08:19 -08:00
Jean-Michel Trivi
f1b244c3fa Merge "Add function to derive a channel mask from a channel count" 2012-03-05 14:51:42 -08:00
Jean-Michel Trivi
4ab051ab46 Add function to derive a channel mask from a channel count
Change-Id: I22523ded9cd8e5283a285a9db21d819bbbc1b6c3
2012-03-05 13:59:09 -08:00
Robert Greenwalt
8702bb17f4 New NativeDaemonConnector protocol adds a seqnum.
Allows for one socket to be multiplexed for multiple requests.
Doesn't use command sequence numbers for broadcasts - would make no sense.
Doesn't alter current default behavior so OEM's using these classes
won't notice a difference.
bug:5864209

Change-Id: Ie3b19c4f81eea868569229a365c8cb7de249c2dd
2012-03-05 11:44:43 -08:00
Jeff Brown
3817a79ded Use #define value of 1 to indicate presence of headers.
strace tests the value of HAVE_TERMIO_H and HAVE_SYS_UIO_H using

Change-Id: If899845503547410cf17d005733d1c0c6741e939
2012-03-02 17:33:52 -08:00
Eric Laurent
cef6db21fd Merge "renamed audio policy output flag." 2012-03-01 10:17:15 -08:00
Eric Laurent
2e9d845850 renamed audio policy output flag.
Renamed AUDIO_POLICY_OUTPUT_FLAG_INDIRECT to AUDIO_POLICY_OUTPUT_FLAG_NONE
which is more appropriate.

Change-Id: Ie898ddc2279db55a65ece96e09232163c2e78024
2012-03-01 09:43:07 -08:00
Andrew Hsieh
977fc4e915 Merge "Fixed two 64-bit porting issues; Make pid/tid type consistent" 2012-02-29 17:46:26 -08:00
Andrew Hsieh
d2c8f52189 Fixed two 64-bit porting issues; Make pid/tid type consistent
1. In printf, use "%zu" for variable of type size_t
2. Print tid in %5d
3. Make type of pid/tid in AndroidLogEntry and logger_entry consistent

Change-Id: I3e3d9536ee58823f349a4734ae093d30eabe1bfe
2012-02-29 17:00:46 -08:00
Dima Zavin
830e19731d ion: fix header for including in C++ code
Change-Id: I8fc10ac397e60d329a6887f0590d4dba6cbc7545
Signed-off-by: Dima Zavin <dima@android.com>
2012-02-27 16:33:03 -08:00
Mathias Agopian
c958a7f498 add missing include
Change-Id: Id93278c59cfdf72a62a4fe26178bd5c3e43b089e
2012-02-25 21:13:36 -08:00
Rebecca Schultz Zavin
afd9123946 Add ion helper library
This library contains helper functions for using ion

Change-Id: I7d7f76d6d3f36cd94d67797a38099a94214392b1
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
2012-02-23 12:18:31 -08:00
Dianne Hackborn
ca185abcb5 New user definitions for isolated sandboxes.
Change-Id: I302f89c102bc35dcd70168748e205b41fdbf6576
2012-02-09 11:19:00 -08:00
Guang Zhu
a8185a622e Revert "New NativeDaemonConnector protocol adds a seqnum."
Reverting because it seems to break `adb reboot`

This reverts commit dc58e73071.

Change-Id: Ib8cc4379254694398cbb7f3e7a64c20e1ed8c1ba
2012-02-07 19:26:54 -08:00
Robert Greenwalt
dc58e73071 New NativeDaemonConnector protocol adds a seqnum.
Allows for one socket to be multiplexed for multiple requests.
bug:5864209

Change-Id: I934c88da25d95e093371f455442bdf2f0ed7a4f4
2012-02-07 16:00:07 -08:00
Glenn Kasten
d21b89db1e Merge "Use audio_format_t consistently" 2012-01-20 14:50:35 -08:00
Jeff Brown
e66293900b Set HAVE_LOCALTIME_R to 1 when defined.
SQLite 3.7.10 tests the value of the HAVE_LOCALTIME_R macro
if it is defined, so we set it to 1.

Change-Id: I8c34ec362813018f86aea57d1b36b7639d0dd96d
2012-01-19 16:31:57 -08:00
David 'Digit' Turner
7913bc05be libcutils: Use proper private header to access C library's <time.h> extension
The strftime_tz() function is not a standard C library function and should not
appear in <time.h>. Instead, it is being moved to <bionic_time.h>, a private
header only available to platform libraries.

Change-Id: I4dc18939b9380725dfaa20c9e417296363bc52f4
2012-01-13 13:38:40 +01:00
Glenn Kasten
828bf0cdf4 Use audio_format_t consistently
Change-Id: I7eb489b1c1cbe9bfadd43cd7645da86b90fab652
2012-01-12 13:20:35 -08:00
Steve Block
ceabb17306 Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE
Bug: 5449033
Change-Id: I991dc84c366d8f33e5439894c23df561bbc50b83
2012-01-10 21:13:57 +00:00
Steve Block
8f2e8b0a45 am a9b84a7e: Add ALOG version of LOG_ASSERT
* commit 'a9b84a7e0b3ecb389a62bc6abb8c2fea3a4a30a6':
  Add ALOG version of LOG_ASSERT
2012-01-10 11:32:17 -08:00
Steve Block
a9b84a7e0b Add ALOG version of LOG_ASSERT
This is now required by some projects.

Change-Id: If4015c6a9f2391b205d2886bcf7f6e51f371ce08
2012-01-09 22:50:36 +00:00
Steve Block
01dda204cd Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE
Bug: 5449033
Change-Id: Ibcffdcf620ebae1c389446ce8e9d908f11ac039c
2012-01-08 11:03:26 +00:00
Steve Block
ae8b56c0d1 Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE
Bug: 5449033
Change-Id: I1e070511b6a538e9f1c94657356437a457d58882
2012-01-05 22:25:38 +00:00
Steve Block
fe71a61e5b Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE
Bug: 5449033
Change-Id: I4951baa981f09a84ce483e3d1bd0f9ebe009035f
2012-01-04 19:23:34 +00:00
Steve Block
8d66c49258 Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE
Bug: 5449033
Change-Id: I9244d927f14c750cd359ebffb1fc1c355a755d5a
2012-01-03 22:32:30 +00:00
Steve Block
e7e7fac974 Add ALOG versions of LOGD, LOGI, LOGW and LOGE
These are now required by some projects.

Change-Id: I0d51c950178504474d803620a6cd1c9f084804b5
2011-12-29 11:58:24 +00:00
Jesse Hall
e565492c6c am 3bc5e452: am 7cd3e0a3: Document ANativeWindow\'s buffer refcounting
* commit '3bc5e452808514c48cdb5d2c3ca14c022aeecf6f':
  Document ANativeWindow's buffer refcounting
2011-12-13 12:25:10 -08:00
Jesse Hall
3bc5e45280 am 7cd3e0a3: Document ANativeWindow\'s buffer refcounting
* commit '7cd3e0a3a2f9b104cd6c04f699ae62c4577787e2':
  Document ANativeWindow's buffer refcounting
2011-12-13 12:23:14 -08:00
Jesse Hall
7cd3e0a3a2 Document ANativeWindow's buffer refcounting
Change-Id: I5454e90afd1a1b7d4a75c503f8dca712dba33790
2011-12-12 16:54:14 -08:00
Wu-cheng Li
601b5f416e Merge "Add camera focus move message." 2011-11-29 16:54:18 -08:00
Wu-cheng Li
3dc54060c1 Add camera focus move message.
bug:5534973
Change-Id: I45213b1a4db3dbcfc0ab124689f27a88335fb26b
2011-11-29 14:28:54 +08:00
Jeff Brown
b75a9a833b Merge "Improve backtrace formatting." 2011-11-22 12:57:15 -08:00
Jeff Brown
19b39f371b Improve backtrace formatting.
Show the symbol offset, when available.

Centralized formatting of native stack traces in libcorkscrew.
It's handy for automated tools if all stacks look the same.
Since we already made them all look them same, we might as well
do the formatting in just one place.

Do not strip the Thumb bit on ARM.  This fixes an off-by-one
issue that could happen when resolving a PC that was at the
very beginning of a Thumb function, since the symbol table would
have the Thumb bit set but since we stripped the bit from our
PC, we would be looking for an address one byte before the
one listed in the symbol table.  It's also quite useful to see
whether a given function is executing in Thumb mode just by glancing
at the PC.

Change-Id: Icaa29add85ce0bcafe24d5ce2098e138d809e2ab
2011-11-22 12:13:46 -08:00
Nick Pelly
3544e33247 am 3d547e0d: am f9c1fcc5: Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1
* commit '3d547e0dda7ad58108a219c7ef20bab426d5ea38':
  Replace vendor specific NfcGoogle.apk with generic Nfc.apk
2011-11-21 21:08:24 -08:00
Nick Pelly
3d547e0dda am f9c1fcc5: Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1
* commit 'f9c1fcc505d59fd87392e6af7341b1737f186081':
  Replace vendor specific NfcGoogle.apk with generic Nfc.apk
2011-11-21 16:05:27 -08:00
Nick Pelly
097b4ed410 Replace vendor specific NfcGoogle.apk with generic Nfc.apk
The access control changes allow us to just use Nfc.apk with
the regular platform certificate, instead of the custom signed
NfcGoogle.apk. So we can compeltely get rid of vendor/google/apps/NfcGoogle
and just build it out of packages/apps/Nfc now.

The package name is also reverted from com.android.nfc3 to com.android.nfc

The NFC uid needs to get bumped (25 to 27) to allow the cert change.

Bug: 5608249
Change-Id: I5e178b469e5210cd231ba5f4ea57aa666b3d8893
2011-11-21 14:55:59 -08:00
Jean-Baptiste Queru
17aad1469a Revert "Fix build"
This reverts commit 25a89e771a.
2011-11-15 13:59:05 -08:00
Steve Block
98520ab9a6 am 67b11cba: am 25a89e77: Fix build
* commit '67b11cba5bccd0cdc3ce6117a19c5f036f95d35f':
  Fix build
2011-11-15 13:07:22 -08:00
Steve Block
67b11cba5b am 25a89e77: Fix build
* commit '25a89e771aae292193244852166564e83e36232b':
  Fix build
2011-11-15 11:10:09 -08:00
Steve Block
25a89e771a Fix build
Change-Id: Icbe57024e6018600d47a68132f53f15d7602dc92
2011-11-15 10:58:49 -08:00
Jeff Brown
f0c5872637 Improve stack unwinder robustness.
Keep track of whether memory maps are readable.  Use the information
in try_get_word to try to avoid accidentally dereferencing an invalid
pointer within the current process.  (Note that I haven't ever
seen that happen during normal unwinding, but it pays to be
a little more careful.)

Refactored try_get_word a little to make it easier to pass it the
needed state for validation checks by way of a little memory_t struct.

Improved how the memory map for the current process is cached.  This is
important because we need up to date information about readable maps.
Use a 5 second cache expiration.

Improved the PC -> LR fallback logic in the unwinder so we can
eke out an extra frame sometimes.

Fixed a bug reading ELF program headers.  The phnum & phentsize
fields are half-words.  We were incorrectly interpreting
phnum as a whole word.

Used android_atomic_* operations carefully in the unwinder
to prevent possible memory races between the dumper and the dumpee.
This was highly unlikely (or even impossible due to the presence
of other barriers along the way) but the code is clearer now about
its invariants.

Fixed a bug in debuggerd where the pid was being passed to have
its stack dump taken instead of the tid, resulting in short
stacks because ptrace couldn't read the data if pid != tid.
Did a full sweep to ensure that we use pid / tid correctly everywhere.

Ported old code from debuggerd to rewind the program counter back
one instruction so that it points to the branch instruction itself
instead of the return address.

Change-Id: Icc4eb08320052975a4ae7f0f5f0ac9308a2d33d7
2011-11-04 01:11:04 -07:00
Jean-Baptiste Queru
1941c91389 am 4ef824e9: am 71619f13: am 604f52e3: Reconcile with AOSP master
* commit '4ef824e9481625270aa065cc4d0625e8c8d9e0df':
2011-10-28 15:43:04 +00:00
Steve Block
4ddc88e73e am 16210c12: am 31a02dba: Fix build
* commit '16210c12bc0a8dab5523289de1e51b6fe8d38053':
  Fix build
2011-10-28 15:38:18 +00:00