Commit graph

13117 commits

Author SHA1 Message Date
Elliott Hughes
d09e316906 am d0008c97: Merge "Fix \' escaping in adb."
* commit 'd0008c971dce0e90f49426ac79af190514551f1f':
  Fix ' escaping in adb.
2015-05-15 21:19:21 +00:00
Elliott Hughes
d0008c971d Merge "Fix ' escaping in adb." 2015-05-15 21:11:25 +00:00
Elliott Hughes
84b0bf2264 Fix ' escaping in adb.
You can't just use \' inside a single-quoted string.

Bug: http://b/20323053
Bug: http://b/3090932
Change-Id: I73754b097671d02dc11c35052f0534b6dd789e4f
2015-05-15 12:06:00 -07:00
Christopher Ferris
11d78d46a6 am 3f7e06ae: Merge "Prevent crashes if a map cannot be created."
* commit '3f7e06aef5376daba7e8790e575da1d7b52f719c':
  Prevent crashes if a map cannot be created.
2015-05-15 18:32:49 +00:00
Christopher Ferris
3f7e06aef5 Merge "Prevent crashes if a map cannot be created." 2015-05-15 18:25:01 +00:00
Christopher Ferris
30c942cf10 Prevent crashes if a map cannot be created.
Under some conditions, /proc/<pid>/maps might return nothing. If we
try and unwind in this case, we'll crash. Check this case and fail
the unwind.

Add checks that no other functions try and use map_ without
checking for nullptr.

Add logging when an unwind fails so it's clear what happened.

Bug: 21162746
Change-Id: I56ce51dda0cfc9db20475a441f118108196aa07c
2015-05-14 17:56:41 -07:00
Elliott Hughes
bca8dc6a44 am 000c009b: Merge "Reduce the coldboot timeout to 1s."
* commit '000c009bcc71bf8218d20c5575d3ae44c8bd4cda':
  Reduce the coldboot timeout to 1s.
2015-05-14 20:22:50 +00:00
Elliott Hughes
000c009bcc Merge "Reduce the coldboot timeout to 1s." 2015-05-14 20:14:32 +00:00
Chih-Hung Hsieh
6046f4180d am 2cc25440: Merge "Enable clang compilation."
* commit '2cc2544024364ec532a6d49131cb842fe9b559ae':
  Enable clang compilation.
2015-05-14 19:27:39 +00:00
Chih-Hung Hsieh
2cc2544024 Merge "Enable clang compilation." 2015-05-14 19:21:22 +00:00
Elliott Hughes
c7331d02d1 Reduce the coldboot timeout to 1s.
5s was already a ridiculously long time to delay booting, and some OEMs are
trying to make it even more insane:

  https://www.codeaurora.org/cgit/quic/la/platform/system/core/commit/?h=lp&id=fd23edd48272976d2fb333f377242173f92aa343

Let's at least ensure that Nexus and Android One devices don't take forever
to boot...

Bug: http://b/19899875
Change-Id: I9680c166a759360f34118e51cd0645e12b6bd5c8
2015-05-14 12:03:14 -07:00
Chih-Hung Hsieh
1cd02d3443 Enable clang compilation.
Previous clang/llvm bug was fixed.

BUG: 18790528
Change-Id: Ib12696030d34ebc3c3ef1bca3cad0139d631417e
2015-05-14 10:53:48 -07:00
Christopher Ferris
44b4d34753 am 34804b90: Merge "Add tests for elf unwinding in memory."
* commit '34804b90ecc8d4d39e22b70ee7110e7f7df5daea':
  Add tests for elf unwinding in memory.
2015-05-13 18:13:24 +00:00
Christopher Ferris
34804b90ec Merge "Add tests for elf unwinding in memory." 2015-05-13 17:58:13 +00:00
Mark Salyzyn
2a3e5be6c4 am 10c18d64: Merge "liblog: gtest open("/dev/pmsg0", "a")"
* commit '10c18d64c6d414ec9e2ecfe524a1e51cc2ac128c':
  liblog: gtest open("/dev/pmsg0", "a")
2015-05-13 17:04:49 +00:00
Mark Salyzyn
10c18d64c6 Merge "liblog: gtest open("/dev/pmsg0", "a")" 2015-05-13 16:30:59 +00:00
Mark Salyzyn
1389791c65 am d1371a8b: Merge "logd: Add TID statistics"
* commit 'd1371a8b8b55352e19332ba87f4b3ece6db58e1f':
  logd: Add TID statistics
2015-05-13 16:21:38 +00:00
Mark Salyzyn
1fad20cf49 am 0c6c4150: Merge changes I2cda9dd7,Ifb560850,I8d4c7c5a
* commit '0c6c41502acdd73ddcefd2f52489d94e3ca70241':
  logd: Cleanup
  logcat: liblog: Add "usec" format argument
  logd: Add klogd
2015-05-13 16:21:37 +00:00
Mark Salyzyn
d1371a8b8b Merge "logd: Add TID statistics" 2015-05-13 16:17:37 +00:00
Mark Salyzyn
0c6c41502a Merge changes I2cda9dd7,Ifb560850,I8d4c7c5a
* changes:
  logd: Cleanup
  logcat: liblog: Add "usec" format argument
  logd: Add klogd
2015-05-13 16:14:25 +00:00
Christopher Ferris
67aba6881d Add tests for elf unwinding in memory.
Bug: 19517541
Change-Id: Ib42360a82934ff7103e2ccb64c1105c59aa3fdea
2015-05-12 16:11:47 -07:00
Mark Salyzyn
7718778793 logd: Cleanup
- Android Coding Standard for Constructors
- Side effects NONE

Change-Id: I2cda9dd73f3ac3ab58f394015cb810820093d47b
2015-05-12 15:51:46 -07:00
Mark Salyzyn
e1f2004ecc logcat: liblog: Add "usec" format argument
- Add additional 3 digits of time precision for time output
  adding in the reporting of usec
- Remove trailing space in header file

Change-Id: Ifb560850b8e01080e126fbaeab640db71cce3eea
2015-05-12 15:51:46 -07:00
Mark Salyzyn
ae4d928d81 logd: Add klogd
- Add a klogd to collect the kernel logs and place them into a
  new kernel log buffer
- Parse priority, tag and message from the kernel log messages.
- Turn off pruning for worst UID for the kernel log buffer
- Sniff for 'PM: suspend exit', 'PM: suspend enter' and
  'Suspended for' messages and correct the internal definition
  time correction against monotonic dynamically.
- Discern if we have monotonic or real time (delineation 1980) in
  audit messages.
- perform appropriate math to correct the timestamp to be real time
- filter out any external sources of kernel logging

Change-Id: I8d4c7c5ac19f1f3218079ee3a05a50e2ca55f60d
2015-05-12 15:51:46 -07:00
Eric Laurent
b942d6fbb6 am 74f0a578: Merge "audio: Fix false positives in audio_is_remote_submix_device()"
* commit '74f0a578a8ee0957b849e811af5fc30c74be55f0':
  audio: Fix false positives in audio_is_remote_submix_device()
2015-05-12 22:47:08 +00:00
Mark Salyzyn
052bb26151 am 88462ba7: Merge "logd: Add Tag statistics"
* commit '88462ba7fcde3dc9a07b484bd3d526836e000b4b':
  logd: Add Tag statistics
2015-05-12 22:40:44 +00:00
Eric Laurent
74f0a578a8 Merge "audio: Fix false positives in audio_is_remote_submix_device()" 2015-05-12 22:40:01 +00:00
Mark Salyzyn
88462ba7fc Merge "logd: Add Tag statistics" 2015-05-12 22:31:46 +00:00
Elliott Hughes
3d0bf350f7 am 6f9db165: Merge "Fix insmod module size"
* commit '6f9db165a49e6763fb2101d6da057a223cee21c8':
  Fix insmod module size
2015-05-12 21:45:01 +00:00
Elliott Hughes
6f9db165a4 Merge "Fix insmod module size" 2015-05-12 21:34:26 +00:00
Misael Lopez Cruz
bee4965cb2 audio: Fix false positives in audio_is_remote_submix_device()
The audio_is_remote_submix_device() helper function incorrectly
reported AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES and
AUDIO_DEVICE_IN_LINE as a submix devices.

The cases where the confusion occurs are for devices whose bitwise
value only differs in the direction bit.

Change-Id: I3bb9fd1158a26a8f4b3b59246974e703ca5ba0f0
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
2015-05-12 16:25:38 -05:00
Tom Cherry
eaa3b4ec6f Fix insmod module size
read_file() used to append a new line character to the end of the buffer it
returns, because parse_config() isn't able to cope with input that's not
'\n'-terminated. Fix read_file() to be less insane, and push the workarounds
into the parse_config() callers.

Longer term we should rewrite parse_config().

Change-Id: Ie9d9a7adcd33b66621726aef20c4b8cc51c08be7
2015-05-12 14:18:49 -07:00
Mark Salyzyn
17ed6797df logd: Add TID statistics
Bug: 19608965
Change-Id: Ifbf0b00c48ef12b5970b9f9f217bd1dd8f587f2c
2015-05-12 12:57:25 -07:00
Mark Salyzyn
344bff4391 logd: Add Tag statistics
- Optional class of statistics for events Tags
- export tagToName from LogBuffer (located in main.cp to address
  https://android-review.googlesource.com/#/c/110204)
- Can not handle dropped because getTag() can not work,
  will need to be fixed if we start filtering.

Bug: 19608965
Change-Id: I7b90607ca588bf37bab71f19b1570a290e772776
2015-05-12 12:53:27 -07:00
Mark Salyzyn
672c990ef0 am 7297278a: Merge "logd: pidToName deficiency"
* commit '7297278ade9de51e63568188782f56e2ad2bcf6b':
  logd: pidToName deficiency
2015-05-12 19:48:09 +00:00
Mark Salyzyn
7297278ade Merge "logd: pidToName deficiency" 2015-05-12 19:38:40 +00:00
Elliott Hughes
6b92181a3d am bc014afb: Merge "Switch arch-arm/memset32.S to unified syntax."
* commit 'bc014afbfa46cdf6c24a7812cb28c9c553b28805':
  Switch arch-arm/memset32.S to unified syntax.
2015-05-12 14:56:46 +00:00
Elliott Hughes
5848c4589a am f69624a1: Merge "Remove dead files."
* commit 'f69624a1ef6d1792d73c32cc985362458f1b7442':
  Remove dead files.
2015-05-12 14:50:39 +00:00
Elliott Hughes
bc014afbfa Merge "Switch arch-arm/memset32.S to unified syntax." 2015-05-12 14:49:35 +00:00
Elliott Hughes
f69624a1ef Merge "Remove dead files." 2015-05-12 14:43:01 +00:00
Elliott Hughes
36284db817 Switch arch-arm/memset32.S to unified syntax.
This fixes the clang build.

Change-Id: I492c7dc016986020de3f70a77e0ace6610f50765
2015-05-11 22:22:13 -07:00
Elliott Hughes
fe93e8d2a7 Remove dead files.
Auto-imported from cupcake, not touched since then, or used anyway.

Change-Id: If2d50cddff0238dff818c7bae92fe8e1100fccdf
2015-05-11 21:57:33 -07:00
Mark Salyzyn
ff1f639c80 am 80b129f9: Merge "logd: uidToName add dex2oat UID"
* commit '80b129f9f08ce9d8b4e315a4413dda61e5dbdd75':
  logd: uidToName add dex2oat UID
2015-05-12 00:01:53 +00:00
Mark Salyzyn
80b129f9f0 Merge "logd: uidToName add dex2oat UID" 2015-05-11 23:51:32 +00:00
Elliott Hughes
1c9bfdae21 am adffad25: Merge "adb: Do not share memory between multiple thread"
* commit 'adffad25a5464b65f9c58d3d06f7a7ac0bca04e2':
  adb: Do not share memory between multiple thread
2015-05-11 23:37:30 +00:00
Elliott Hughes
adffad25a5 Merge "adb: Do not share memory between multiple thread" 2015-05-11 23:30:26 +00:00
Alan Jeon
4af3c40c4a adb: Do not share memory between multiple thread
When multiple client try to connect to other hosts, it failed because
memory corruption. Allocate memory for each thread like other command did.

Change-Id: I79959ce3dbfd11c7553736cd3f5a899815873584
Signed-off-by: Alan Jeon <skyisle@gmail.com>
2015-05-11 16:28:04 -07:00
Nick Kralevich
88e184d981 am 97d0c193: Merge "Revert "libaudit: limit to 5 selinux denials per sec""
* commit '97d0c1935447b4fc91bd59f604ab92e9e579efa3':
  Revert "libaudit: limit to 5 selinux denials per sec"
2015-05-11 22:50:29 +00:00
Nick Kralevich
97d0c19354 Merge "Revert "libaudit: limit to 5 selinux denials per sec"" 2015-05-11 22:38:58 +00:00
Elliott Hughes
a66426ce50 am 85abaf66: Merge "Failure to find an oem partition should not be a remount failure."
* commit '85abaf66c499a44326d83d488f4b4f5add235f4a':
  Failure to find an oem partition should not be a remount failure.
2015-05-11 20:47:43 +00:00