Commit Graph

3232 Commits

Author SHA1 Message Date
The Android Open Source Project 6940ec41d1 Reconcile with ics-mr1-release
Change-Id: I3451784a6887c3d4f82e6c124d28232b3b688d38
2011-11-30 12:56:23 -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
The Android Automerger 999a193181 merge in ics-mr1-release history after reset to ics-mr1 2011-11-28 12:23:45 -08:00
Jeff Brown e4e21796f7 Make timestamps friendlier.
Change-Id: I378c3028630a7f805c3f730da02bbbfe07ec3654
2011-11-23 15:02:41 -08:00
The Android Open Source Project 5c9263d819 Reconcile with ics-mr1-release
Change-Id: I218c334a9e76e161bda994ced6b5ba41f0c79ddd
2011-11-22 13:26:30 -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
The Android Automerger a985651967 merge in ics-mr1-release history after reset to ics-mr1 2011-11-22 11:57:10 -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 f9c1fcc505 Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1 2011-11-21 16:03:43 -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
Jeff Brown de8b136d5a Merge "Minor robustness tweaks." 2011-11-21 13:13:12 -08:00
Jeff Brown 585d578a21 Merge "Delete dead code." 2011-11-21 13:12:57 -08:00
Jeff Brown 677545639c Minor robustness tweaks.
Use the alternate stack specified by sigaltstack (if there is one).

Use tgkill instead of kill to ensure that we send the signal to
precisely the right thread.

Added timeout logic.

Change-Id: I72922137d1bc0c8becff98244926bde09fe3990e
2011-11-18 16:35:55 -08:00
Jeff Brown 33901e6024 Delete dead code.
Change-Id: Icfb9bcee2c524026ecbeb7e30e943d8ca299a33a
2011-11-18 15:21:56 -08:00
Nick Kralevich 6bbaaa6301 libsysutils: log dispatchCommand overflow.
Change-Id: Iefd3f7cc170c1fe65209c6ffe10debc21aed0c7f
2011-11-18 08:46:54 -08:00
Andy McFadden 90284b1299 am c96d2aee: (-s ours) am 2a38657d: Merge "DO NOT MERGE - disable memory dumps" into ics-mr1
* commit 'c96d2aeed70f930d26236a20f6d32f0a24d83bd8':
  DO NOT MERGE - disable memory dumps
2011-11-17 13:20:20 -08:00
Andy McFadden c96d2aeed7 am 2a38657d: Merge "DO NOT MERGE - disable memory dumps" into ics-mr1
* commit '2a38657dfcb5655e3e900a3d25695864f3d023a3':
  DO NOT MERGE - disable memory dumps
2011-11-17 09:50:15 -08:00
Andy McFadden 2a38657dfc Merge "DO NOT MERGE - disable memory dumps" into ics-mr1 2011-11-17 09:48:03 -08:00
The Android Open Source Project cf4d03590a am e363d387: am b90cb1d2: am c6023243: Reconcile with ics-factoryrom-2-release
* commit 'e363d387a401ccd3a0635b449f3aa966a65607de':
2011-11-17 04:08:24 -08:00
Andy McFadden ecf0e9e53a DO NOT MERGE - disable memory dumps
This disables the hex dumps of memory for registers other than PC
and LR.

Bug 5484924

Change-Id: I26cff857e5d01ed30548ca3e55bdddd63b592c0c
2011-11-16 15:50:55 -08:00
The Android Open Source Project e363d387a4 am b90cb1d2: am c6023243: Reconcile with ics-factoryrom-2-release
* commit 'b90cb1d20c7d5701e073bf5293a64bfa57861782':
2011-11-16 09:48:22 -08:00
The Android Open Source Project b90cb1d20c am c6023243: Reconcile with ics-factoryrom-2-release
* commit 'c60232434c941b5175a9ebb542b1c872866d3409':
2011-11-16 09:33:01 -08:00
The Android Open Source Project c60232434c Reconcile with ics-factoryrom-2-release
Change-Id: I9671d18aeee882196d56644533c962942c4fbb70
2011-11-16 08:56:49 -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
The Android Open Source Project 2992f1813a Reconcile with ics-mr1-release
Change-Id: Iefafbf68db366745b51f0d62473baa62e84c01ce
2011-11-10 14:36:38 -08:00
Jing Yu 6009842389 Merge "Link with libgccdemangle.so for name demangling." 2011-11-10 13:45:28 -08:00
JP Abgrall 07db700305 am 1351edeb: am 61b90bd2: adb: grant it AID_NET_BW_STATS for full /proc/net/xt_qtaguid/stats
* commit '1351edeb56095fb49ceacd927a15b450d8e8dd62':
  adb: grant it AID_NET_BW_STATS for full /proc/net/xt_qtaguid/stats
2011-11-10 16:14:37 +00:00
The Android Automerger 0026371fcf merge in ics-mr1-release history after reset to ics-mr1 2011-11-10 06:47:41 -08:00
Jing Yu 1a5a497795 Link with libgccdemangle.so for name demangling.
1. X86 target will also have name demangling feature.
2. Remove dependency on libiberty.so, since it will not come
with prebuilt toolchain in gcc-4.6 and after.

Change-Id: Iefbb021c5c3171b9467954eafa54046ad6805753
2011-11-09 20:47:14 -08:00
Irfan Sheriff da96a66b88 Merge "Fix dhcp comments" 2011-11-09 13:42:27 -08:00
Jeff Brown 9323c853ea Merge "Print the tombstone path." 2011-11-09 11:26:01 -08:00
Irfan Sheriff 35c28608bf Fix dhcp comments
Change-Id: Ia99b2c10ff6cf8c75c23db49f1e9cf7a043141cc
2011-11-09 11:11:21 -08:00
JP Abgrall 1351edeb56 am 61b90bd2: adb: grant it AID_NET_BW_STATS for full /proc/net/xt_qtaguid/stats
* commit '61b90bd211021886049f72cb666a5b49b83b3c64':
  adb: grant it AID_NET_BW_STATS for full /proc/net/xt_qtaguid/stats
2011-11-09 18:59:17 +00:00
JP Abgrall 61b90bd211 adb: grant it AID_NET_BW_STATS for full /proc/net/xt_qtaguid/stats
Normally only bandwidth stats for the uid reading .../stats is returned.
With the extra group, adb shell will be able to read stats from
all UIDs.
This is to be used to offer data usage profiling to developers.

Change-Id: If3d2941ce5aa4dbb1a23947b97b893149ba224f7
2011-11-09 10:30:08 -08:00
The Android Automerger 989b2a3a55 merge in ics-mr1-release history after reset to ics-mr1 2011-11-09 06:48:04 -08:00
Robert Greenwalt 06cd7bdc7b am 39b6df11: am c761b54e: Merge "Wimax: wimax related changes for libnetutils" into ics-mr1
* commit '39b6df11dc1875f24b65202f96433fe333fc7bc5':
  Wimax: wimax related changes for libnetutils
2011-11-09 14:34:22 +00:00
Jeff Brown fb9804bfc2 Print the tombstone path.
When explicitly requesting a dump, show the user the path of
the tombstone file that was generated.

Change-Id: I7fff7dea606872a61687ca087e99f604107b70c4
2011-11-08 20:17:28 -08:00
Nick Kralevich f9557fba34 Set /proc/sys/kernel/dmesg_restrict to 1
Set dmesg_restrict to 1 to help limit inadvertent information leaks
from the kernel to non-privileged programs.  Root and programs with
CAP_SYSLOG will continue to have access to dmesg output.

See "dmesg_restrict" in Documentation/sysctl/kernel.txt from the
Linux kernel source code.

Bug: 5585365
Change-Id: Iffcf060ea4bd446ab9acf62b8b61d315d4ec4633
2011-11-08 14:46:19 -08:00
Nick Kralevich 1e339a710e Merge "Set kptr_restrict to 2." 2011-11-08 11:39:43 -08:00
Robert Greenwalt 39b6df11dc am c761b54e: Merge "Wimax: wimax related changes for libnetutils" into ics-mr1
* commit 'c761b54ead5ec3f22fafb7ce50dd5c5a1939b03f':
  Wimax: wimax related changes for libnetutils
2011-11-08 18:03:47 +00:00
Robert Greenwalt c761b54ead Merge "Wimax: wimax related changes for libnetutils" into ics-mr1 2011-11-08 10:02:01 -08:00
The Android Automerger 7938d6d79f merge in ics-mr1-release history after reset to ics-mr1 2011-11-08 06:46:45 -08:00
Ying Wang 67d53e21f5 Merge "Remove unnecessary libraries." 2011-11-07 18:19:12 -08:00
Ying Wang fcc0580a7e Remove unnecessary libraries.
There is no host library named libcutils.

Change-Id: I3b346b9e1a5556cd0cfc932560d9ce54ae6d38f2
2011-11-07 18:18:27 -08:00