Commit Graph

7346 Commits

Author SHA1 Message Date
Christopher Ferris ded7f8b58b am 596bfe67: am 5f662c33: am e8e5f8ed: am 261ff50e: Merge "Init the abort_msg_address value."
* commit '596bfe67eb5d223ef18edb9a5416d5c7353f9036':
  Init the abort_msg_address value.
2014-01-10 23:10:21 +00:00
Christopher Ferris 596bfe67eb am 5f662c33: am e8e5f8ed: am 261ff50e: Merge "Init the abort_msg_address value."
* commit '5f662c3320d1c30495884ac66123666d8fd92933':
  Init the abort_msg_address value.
2014-01-10 23:07:37 +00:00
Elliott Hughes 7e6b5e956b am 7fd0ea9b: am c555476e: am 1972955e: am 99775d87: Merge "Use the more portable <elf.h> instead of <sys/exec_elf.h>."
* commit '7fd0ea9bb19dd0136706dab02454f9a642807a07':
  Use the more portable <elf.h> instead of <sys/exec_elf.h>.
2014-01-10 23:06:50 +00:00
Christopher Ferris 5f662c3320 am e8e5f8ed: am 261ff50e: Merge "Init the abort_msg_address value."
* commit 'e8e5f8edc1176ededf0eddc8907cf898379a30b9':
  Init the abort_msg_address value.
2014-01-10 23:04:50 +00:00
Elliott Hughes 7fd0ea9bb1 am c555476e: am 1972955e: am 99775d87: Merge "Use the more portable <elf.h> instead of <sys/exec_elf.h>."
* commit 'c555476e4a9947b1ce2e5c4668d68d422166bdfa':
  Use the more portable <elf.h> instead of <sys/exec_elf.h>.
2014-01-10 23:03:11 +00:00
Christopher Ferris e8e5f8edc1 am 261ff50e: Merge "Init the abort_msg_address value."
* commit '261ff50e32b2b2a41bd3993c37abb5a9a94e431b':
  Init the abort_msg_address value.
2014-01-10 15:02:42 -08:00
Elliott Hughes c555476e4a am 1972955e: am 99775d87: Merge "Use the more portable <elf.h> instead of <sys/exec_elf.h>."
* commit '1972955eca052b07b454c4d26012f986c02bb06f':
  Use the more portable <elf.h> instead of <sys/exec_elf.h>.
2014-01-10 23:01:19 +00:00
Elliott Hughes 1972955eca am 99775d87: Merge "Use the more portable <elf.h> instead of <sys/exec_elf.h>."
* commit '99775d8751676e76e00ad72d7778ad9ba28cb454':
  Use the more portable <elf.h> instead of <sys/exec_elf.h>.
2014-01-10 14:59:20 -08:00
Christopher Ferris 261ff50e32 Merge "Init the abort_msg_address value." 2014-01-10 22:56:38 +00:00
Elliott Hughes 99775d8751 Merge "Use the more portable <elf.h> instead of <sys/exec_elf.h>." 2014-01-10 22:54:46 +00:00
Christopher Ferris 1da83c3ecc Init the abort_msg_address value.
When initiating a manual dump, the abort_msg_address parameter is random
garbage. Initialize this value to 0.

Change-Id: I9ba817ee6104f47cfcb2b746bfa6f02a259c86d7
2014-01-10 14:46:03 -08:00
Mark Salyzyn 912c88cc5a liblog: Add README
Change-Id: I9d789e08e9301ec8afa7be8bede955379694b904
2014-01-10 14:43:54 -08:00
Elliott Hughes cac5d8c223 Use the more portable <elf.h> instead of <sys/exec_elf.h>.
Bug: 12476126
Change-Id: I08684987e867371d5537dadf1acb3408b420ad0c
2014-01-10 14:40:53 -08:00
Mark Salyzyn 7899c65a30 Merge "liblog: resolve build warning messages" 2014-01-10 22:14:34 +00:00
Benoit Goby f922380f9a am 58c4a7dd: am e3cd2168: am 709543a9: am 08a140e6: Merge "toolbox: Fix date tool with /dev/alarm"
* commit '58c4a7ddf227bd6977677f4c8046eab6376477b3':
  toolbox: Fix date tool with /dev/alarm
2014-01-10 03:43:29 +00:00
Benoit Goby 58c4a7ddf2 am e3cd2168: am 709543a9: am 08a140e6: Merge "toolbox: Fix date tool with /dev/alarm"
* commit 'e3cd2168886b581b091f0912795ee8077fc94e53':
  toolbox: Fix date tool with /dev/alarm
2014-01-10 03:41:26 +00:00
Benoit Goby e3cd216888 am 709543a9: am 08a140e6: Merge "toolbox: Fix date tool with /dev/alarm"
* commit '709543a96836be5f1c10e4051ec6207dec72cd08':
  toolbox: Fix date tool with /dev/alarm
2014-01-10 03:40:04 +00:00
Benoit Goby 709543a968 am 08a140e6: Merge "toolbox: Fix date tool with /dev/alarm"
* commit '08a140e6a3989ece3854014123dac243cc372886':
  toolbox: Fix date tool with /dev/alarm
2014-01-09 19:37:31 -08:00
Benoit Goby 08a140e6a3 Merge "toolbox: Fix date tool with /dev/alarm" 2014-01-10 03:31:56 +00:00
Benoit Goby d340734cd7 toolbox: Fix date tool with /dev/alarm
Change-Id: I6f8ad2149244c89690d5d5caae8ec55429462210
Signed-off-by: Benoit Goby <benoit@android.com>
2014-01-09 18:59:23 -08:00
Christopher Ferris 4a3a0edce1 am 7a6e8c9a: am ec7894cf: am c369f199: am 6e257869: Merge "Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_THREAD."
* commit '7a6e8c9adcb7fa46a16fe930c1c81c94f2a0daef':
  Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_THREAD.
2014-01-10 01:54:26 +00:00
Christopher Ferris 5bbf7d3a5e resolved conflicts for merge of 72256db7 to master
Change-Id: I0b137b011d46d1689fa4e406a2ae0675147510a8
2014-01-09 17:52:46 -08:00
Christopher Ferris 7a6e8c9adc am ec7894cf: am c369f199: am 6e257869: Merge "Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_THREAD."
* commit 'ec7894cf5c08737f5dccacf462dd47c324309c64':
  Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_THREAD.
2014-01-10 00:06:50 +00:00
Christopher Ferris ec7894cf5c am c369f199: am 6e257869: Merge "Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_THREAD."
* commit 'c369f1993b41dac8ac1a005b3bc9312dfa5ebd63':
  Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_THREAD.
2014-01-10 00:04:53 +00:00
Christopher Ferris c369f1993b am 6e257869: Merge "Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_THREAD."
* commit '6e25786914d5f8c50040471c8b1a950d2efb32a1':
  Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_THREAD.
2014-01-09 16:02:21 -08:00
Christopher Ferris 6e25786914 Merge "Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_THREAD." 2014-01-09 23:55:52 +00:00
Christopher Ferris 72256db76e am c49bd655: am 5d2ec87b: am b18f93ea: Merge "Move CallStack to libbacktrace."
* commit 'c49bd655e5233f367c535ed4324bbadc4aea5453':
  Move CallStack to libbacktrace.
2014-01-09 23:50:57 +00:00
Christopher Ferris bc12d6329e Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_THREAD.
Use a bit better name for this. The other name was a bit confusing.

Change-Id: I1261f2ee3854a9c8b82133ad0bfbbbe48b43c9ac

(cherry picked from commit 242b1a8c7a)

Conflicts:
	libbacktrace/Backtrace.cpp
2014-01-09 15:49:39 -08:00
Christopher Ferris c49bd655e5 am 5d2ec87b: am b18f93ea: Merge "Move CallStack to libbacktrace."
* commit '5d2ec87bf54dc8a02e6bcbe5848fd378056b8f78':
  Move CallStack to libbacktrace.
2014-01-09 23:48:26 +00:00
Christopher Ferris 5d2ec87bf5 am b18f93ea: Merge "Move CallStack to libbacktrace."
* commit 'b18f93ea5d57b8dff31c6cc706c6b4f32180c0c8':
  Move CallStack to libbacktrace.
2014-01-09 15:46:44 -08:00
Christopher Ferris b18f93ea5d Merge "Move CallStack to libbacktrace." 2014-01-09 23:41:14 +00:00
Christopher Ferris 038ac694b3 Move CallStack to libbacktrace.
Fix a small bug in the Printer for strings that didn't properly
prepend the prefix.

(cherry picked from commit 9b0e074c6d)

Change-Id: I78bfa3f76864c34f33fb439bf20dfc85616f1077
2014-01-09 15:09:13 -08:00
Mark Salyzyn 153b370624 liblog: resolve build warning messages
Change-Id: Icc6f1f2c926a008efc4df71022cfde8d0e285880
2014-01-09 10:42:20 -08:00
Mark Salyzyn 6aedf1d3d4 Merge "liblog: high CPU usage from logcat" 2014-01-09 18:08:52 +00:00
Colin Cross 4f3c6aed7b am 3fb5ebc5: am 3794c96f: am c121c69b: am b0751101: Merge "HP USB ID"
* commit '3fb5ebc565f1550d61c4afb4ae6f9afa73cf12b3':
  HP USB ID
2014-01-09 18:06:41 +00:00
Colin Cross 3fb5ebc565 am 3794c96f: am c121c69b: am b0751101: Merge "HP USB ID"
* commit '3794c96f3e7bb27e56336035bcd7ac643c6869fc':
  HP USB ID
2014-01-09 18:04:17 +00:00
Colin Cross 0a05f002fb am 4082bf8c: am ce1340c6: am 5a369629: am cd0f824a: Merge "Fix tracing on user builds"
* commit '4082bf8c963dbd44fe2f6367fa687217cbac58d3':
  Fix tracing on user builds
2014-01-09 18:03:13 +00:00
Colin Cross 3794c96f3e am c121c69b: am b0751101: Merge "HP USB ID"
* commit 'c121c69b856bfa9baea105439fbdac648d154097':
  HP USB ID
2014-01-09 18:01:55 +00:00
Colin Cross 4082bf8c96 am ce1340c6: am 5a369629: am cd0f824a: Merge "Fix tracing on user builds"
* commit 'ce1340c665e8840c8856898bbfb7ee3b33765359':
  Fix tracing on user builds
2014-01-09 18:00:54 +00:00
Colin Cross c121c69b85 am b0751101: Merge "HP USB ID"
* commit 'b0751101b090a8732c62ad261fa44e5d6a69a2cc':
  HP USB ID
2014-01-09 09:59:30 -08:00
Colin Cross ce1340c665 am 5a369629: am cd0f824a: Merge "Fix tracing on user builds"
* commit '5a3696297b2f8d463ba601772df7af5966321d2e':
  Fix tracing on user builds
2014-01-09 17:58:28 +00:00
Colin Cross 5a3696297b am cd0f824a: Merge "Fix tracing on user builds"
* commit 'cd0f824a7cfe91f4db24511830658228487ae919':
  Fix tracing on user builds
2014-01-09 09:56:04 -08:00
Colin Cross b0751101b0 Merge "HP USB ID" 2014-01-09 17:52:21 +00:00
Colin Cross cd0f824a7c Merge "Fix tracing on user builds" 2014-01-09 17:50:34 +00:00
Mark Salyzyn 080bbfab94 liblog: high CPU usage from logcat
BUG: 12457855

- log_read.c poll timeout should be -1 instead of 0 when idling

Change-Id: I9082a15fae0fbf999c0ed516950a49d65a279298
2014-01-09 09:04:59 -08:00
Christopher Ferris a74ead0fd6 resolved conflicts for merge of 72f204de to master
Change-Id: I7345014d00c669aea5e27ea50b2ac658145b068b
2014-01-08 16:20:50 -08:00
Nick Kralevich 0969ec3a55 am 218878d4: am df8d0ffd: am 72f269f3: am 8830b53b: Merge "Label existing /data/mediadrm files."
* commit '218878d447b58b357f0dc97bfe6b77196d35a729':
  Label existing /data/mediadrm files.
2014-01-08 23:49:18 +00:00
Christopher Ferris 72f204de1f am 5ca7d87f: am f1f150d0: am 0c863cb5: Merge "Refactor to share map_info amongst threads."
* commit '5ca7d87fe47ad18594b5c5f79d00aa86ed1435cb':
  Refactor to share map_info amongst threads.
2014-01-08 23:45:54 +00:00
Nick Kralevich 218878d447 am df8d0ffd: am 72f269f3: am 8830b53b: Merge "Label existing /data/mediadrm files."
* commit 'df8d0ffd73f8359def90d2f79d25059023018213':
  Label existing /data/mediadrm files.
2014-01-08 23:45:53 +00:00
Christopher Ferris 5ca7d87fe4 am f1f150d0: am 0c863cb5: Merge "Refactor to share map_info amongst threads."
* commit 'f1f150d0e6e27588d0b15a53e7fac4984bf6ccd8':
  Refactor to share map_info amongst threads.
2014-01-08 23:43:53 +00:00