Commit Graph

9043 Commits

Author SHA1 Message Date
Dan Albert 917152b8cc am 3f01965b: am 121f209d: am e1efe23f: Merge "Fix unbundled branches"
* commit '3f01965b3d1335ffff57e15fd47e5d99400dad3f':
  Fix unbundled branches
2014-05-19 19:31:17 +00:00
Dan Albert 3f01965b3d am 121f209d: am e1efe23f: Merge "Fix unbundled branches"
* commit '121f209d3ea770109c9ebe0b6f8a965f91d5a2ef':
  Fix unbundled branches
2014-05-19 19:28:03 +00:00
Dan Albert 121f209d3e am e1efe23f: Merge "Fix unbundled branches"
* commit 'e1efe23ff718d25c5f3d5ef7914f05f8f739eee5':
  Fix unbundled branches
2014-05-19 19:24:28 +00:00
Dan Albert e1efe23ff7 Merge "Fix unbundled branches" 2014-05-19 19:21:37 +00:00
Dan Albert a8b8460220 Fix unbundled branches
Change-Id: Ic8a58a6cf55221ec361bbb80c7c9636fe1349943
2014-05-19 11:40:27 -07:00
Dan Albert 7ce29b5826 am e9b36f1a: am 888f95e2: am f03bd953: Merge "Adds libc++ versions of libbacktrace"
* commit 'e9b36f1a9a280877cb130452c50af6a51360a203':
  Adds libc++ versions of libbacktrace
2014-05-19 18:33:51 +00:00
Dan Albert e9b36f1a9a am 888f95e2: am f03bd953: Merge "Adds libc++ versions of libbacktrace"
* commit '888f95e2e2dd4c56e4aba1785c77342ab4420186':
  Adds libc++ versions of libbacktrace
2014-05-19 18:30:40 +00:00
Dan Albert 888f95e2e2 am f03bd953: Merge "Adds libc++ versions of libbacktrace"
* commit 'f03bd9537b77f996cddd562d88558151d3d6c7fd':
  Adds libc++ versions of libbacktrace
2014-05-19 18:23:08 +00:00
Dan Albert f03bd9537b Merge "Adds libc++ versions of libbacktrace" 2014-05-19 18:19:08 +00:00
Dan Albert 40a46dde9c Adds libc++ versions of libbacktrace
Change-Id: I4a1ce30e7c2166ac1846cc90de0252beee542ee6
2014-05-19 10:23:16 -07:00
Elliott Hughes bb8e90e87e am f6aa4863: am 343e49e3: am 0296be9d: Merge "Teach debuggerd the name of SIGTRAP."
* commit 'f6aa4863a2f1e6f37685520de7f85c96f7b6f1d3':
  Teach debuggerd the name of SIGTRAP.
2014-05-17 08:34:57 +00:00
Elliott Hughes f6aa4863a2 am 343e49e3: am 0296be9d: Merge "Teach debuggerd the name of SIGTRAP."
* commit '343e49e3343817ec3adf1145039cb4e5d143674a':
  Teach debuggerd the name of SIGTRAP.
2014-05-17 07:53:01 +00:00
Elliott Hughes 343e49e334 am 0296be9d: Merge "Teach debuggerd the name of SIGTRAP."
* commit '0296be9d98fa429a17c90d4ec4d0becb18b9f8ec':
  Teach debuggerd the name of SIGTRAP.
2014-05-17 06:37:09 +00:00
Elliott Hughes 0296be9d98 Merge "Teach debuggerd the name of SIGTRAP." 2014-05-17 06:23:15 +00:00
Elliott Hughes a323b504a7 Teach debuggerd the name of SIGTRAP.
Also add SIGTRAP to the list of signals we don't want to double fault on.

Bug: 15024256
Change-Id: I23ab80800563c007fcd3e42527329fedf762f0c8
2014-05-16 21:12:17 -07:00
Elliott Hughes 20b40738bf am 2aa894f3: am 2f1cddfd: am 541859db: Merge "Remove the broken LED flashing code from debuggerd."
* commit '2aa894f3736f6d93fd119b28ea9eb6c531187b68':
  Remove the broken LED flashing code from debuggerd.
2014-05-17 04:09:25 +00:00
Elliott Hughes 2aa894f373 am 2f1cddfd: am 541859db: Merge "Remove the broken LED flashing code from debuggerd."
* commit '2f1cddfd1f622df66bd5b369a650bf0a34c86667':
  Remove the broken LED flashing code from debuggerd.
2014-05-17 04:06:18 +00:00
Elliott Hughes 2f1cddfd1f am 541859db: Merge "Remove the broken LED flashing code from debuggerd."
* commit '541859dbf710946f03999a962e85c4ca3d5c816a':
  Remove the broken LED flashing code from debuggerd.
2014-05-17 04:04:00 +00:00
Elliott Hughes 541859dbf7 Merge "Remove the broken LED flashing code from debuggerd." 2014-05-17 04:02:40 +00:00
Elliott Hughes 27ab751c7b Remove the broken LED flashing code from debuggerd.
Change-Id: I4d0cbe14daa90ac5f91ce4597584448ee3c65dda
2014-05-16 20:54:36 -07:00
Elliott Hughes 7393ba0bfd am 227c3b6c: am a04bad63: am 9cb0b571: Merge "Output correct gdbserver instructions from debuggerd."
* commit '227c3b6ce7ef8c011ad2f3d9bebf9a25c4fffb4b':
  Output correct gdbserver instructions from debuggerd.
2014-05-17 03:43:53 +00:00
Elliott Hughes 227c3b6ce7 am a04bad63: am 9cb0b571: Merge "Output correct gdbserver instructions from debuggerd."
* commit 'a04bad63b905585645378d8de2e214dce75989f1':
  Output correct gdbserver instructions from debuggerd.
2014-05-17 03:40:56 +00:00
Elliott Hughes a04bad63b9 am 9cb0b571: Merge "Output correct gdbserver instructions from debuggerd."
* commit '9cb0b5719c0ac5fefc043f0c61b1640e058b7793':
  Output correct gdbserver instructions from debuggerd.
2014-05-17 03:37:45 +00:00
Elliott Hughes 9cb0b5719c Merge "Output correct gdbserver instructions from debuggerd." 2014-05-17 03:34:38 +00:00
Elliott Hughes d9bf2b2137 Output correct gdbserver instructions from debuggerd.
Bug: 15021938
Change-Id: I2df433d939f5f83ed2a2a30af357b83e4d8e5331
2014-05-16 19:51:41 -07:00
Ying Wang ea28903272 am 73d6dc5c: am b0501ab6: am 770cd7c7: Merge "Fix host 64-bit build."
* commit '73d6dc5cdccedc3def241666aef7562b5fd5b5dd':
  Fix host 64-bit build.
2014-05-17 01:41:49 +00:00
Ying Wang 73d6dc5cdc am b0501ab6: am 770cd7c7: Merge "Fix host 64-bit build."
* commit 'b0501ab66ddf82f5d3b6aa99734e14a1e27c916a':
  Fix host 64-bit build.
2014-05-17 01:38:10 +00:00
Ying Wang b0501ab66d am 770cd7c7: Merge "Fix host 64-bit build."
* commit '770cd7c7e7c18a657f233d86aeecb1d9f3091449':
  Fix host 64-bit build.
2014-05-17 01:34:38 +00:00
Ying Wang 770cd7c7e7 Merge "Fix host 64-bit build." 2014-05-17 01:31:29 +00:00
Elliott Hughes 1bcfe061aa am a7952c5c: am 5e742107: am c4afc192: Merge "Add SIGTRAP support to crasher and debuggerd."
* commit 'a7952c5c5911f612fd1f99259f2e06dc9d1b319d':
  Add SIGTRAP support to crasher and debuggerd.
2014-05-17 00:50:00 +00:00
Elliott Hughes a7952c5c59 am 5e742107: am c4afc192: Merge "Add SIGTRAP support to crasher and debuggerd."
* commit '5e7421073243337075975ecf762ae084765fdb5f':
  Add SIGTRAP support to crasher and debuggerd.
2014-05-17 00:46:11 +00:00
Elliott Hughes 5e74210732 am c4afc192: Merge "Add SIGTRAP support to crasher and debuggerd."
* commit 'c4afc19236ae7253acc3266b4ca8515473e9c7cc':
  Add SIGTRAP support to crasher and debuggerd.
2014-05-17 00:42:36 +00:00
Elliott Hughes c4afc19236 Merge "Add SIGTRAP support to crasher and debuggerd." 2014-05-17 00:39:22 +00:00
Elliott Hughes 7e35ae8fc8 Add SIGTRAP support to crasher and debuggerd.
Bug: 15024256
Change-Id: I3f34993fcfd9799306852b0a2195db468370be6e
2014-05-16 17:27:59 -07:00
Andy Hung a7e8f8615d Add channel count functions for audio masks
audio_channel_count_from_in_mask
audio_channel_count_from_out_mask

Change-Id: Ic519f2c3f85d14acb9526cc8812360fcbd15346d
Signed-off-by: Andy Hung <hunga@google.com>
2014-05-16 23:11:13 +00:00
Colin Cross 14b667aa91 am f6309600: am 3277dc26: am 2d03a498: Merge "correct the setenv option judging condition"
* commit 'f630960088b2fbdb7f147bf9f7a137850df4c89c':
  correct the setenv option judging condition
2014-05-16 21:10:40 +00:00
Mark Salyzyn eb25db1706 resolved conflicts for merge of f742788a to master
Change-Id: I4f902eb0df09a32cbc19fcccc0747bb6a8e3a48c
2014-05-16 14:02:13 -07:00
Colin Cross f630960088 am 3277dc26: am 2d03a498: Merge "correct the setenv option judging condition"
* commit '3277dc269820e4d8785ea46d6a196145e7c88b78':
  correct the setenv option judging condition
2014-05-16 20:51:15 +00:00
Colin Cross 3277dc2698 am 2d03a498: Merge "correct the setenv option judging condition"
* commit '2d03a498f9a1258740a9bbf6b28882506cde3ad9':
  correct the setenv option judging condition
2014-05-16 20:49:37 +00:00
Colin Cross 2d03a498f9 Merge "correct the setenv option judging condition" 2014-05-16 20:47:15 +00:00
Gavin.Chang c3a4676c7f correct the setenv option judging condition
Change-Id: I10ed6275374f572da639f26611f607bf7607905c
2014-05-16 20:46:58 +00:00
Mark Salyzyn f742788ab8 am 24786645: am bc741ac2: Merge "logd: logcat: debuggerd: auditd logs to events"
* commit '24786645d68f76e6dbc9b83c4a113ff53b3c62ad':
  logd: logcat: debuggerd: auditd logs to events
2014-05-16 20:40:17 +00:00
Mark Salyzyn 24786645d6 am bc741ac2: Merge "logd: logcat: debuggerd: auditd logs to events"
* commit 'bc741ac2126727d9de33042fa308307690efe13f':
  logd: logcat: debuggerd: auditd logs to events
2014-05-16 20:36:33 +00:00
Mark Salyzyn bc741ac212 Merge "logd: logcat: debuggerd: auditd logs to events" 2014-05-16 20:34:18 +00:00
Ying Wang cf86e2f85d Fix host 64-bit build.
Bug: 13751317
Change-Id: Ib42d24408d053bacc24142ed18fc5f3181d2345b
2014-05-16 09:36:17 -07:00
Todd Poynor 8f132af495 healthd: Add ENERGY_COUNTER property placeholder, and 64-bit properties
Will add healthd HAL support for ENERGY_COUNTER, and support in some HALs,
in following CLs.

Change-Id: Ife2eaa30473be3a59183c6ce61fdaa61f32dd01b
2014-05-16 03:05:47 +00:00
Colin Cross e1d5247e00 healthd: fix warnings
Fix a few warnings missed when turning on -Werror

Change-Id: I5728664a90d33b95ab3d6ea8823244c59643aedc
2014-05-15 17:49:06 -07:00
Mark Salyzyn 2bb25bf372 am 88a98149: am 13ee94c5: am 8b2d46a5: Merge "init: logd: Allow Developer settings to adjust logd size"
* commit '88a981497ac06046d6da8a99ba17136aa8361b34':
  init: logd: Allow Developer settings to adjust logd size
2014-05-16 00:37:12 +00:00
Mark Salyzyn 88a981497a am 13ee94c5: am 8b2d46a5: Merge "init: logd: Allow Developer settings to adjust logd size"
* commit '13ee94c5106a11bf74d485062115af8cf8d77fe3':
  init: logd: Allow Developer settings to adjust logd size
2014-05-16 00:34:10 +00:00
Mark Salyzyn 13ee94c510 am 8b2d46a5: Merge "init: logd: Allow Developer settings to adjust logd size"
* commit '8b2d46a5fcbe81edde4b7c405916282a142a09d2':
  init: logd: Allow Developer settings to adjust logd size
2014-05-16 00:30:23 +00:00