Commit graph

5348 commits

Author SHA1 Message Date
Ken Sumrall
23d1a02f7c am 1f75eb1e: Merge "logwrapper: Add ability to log to kernel log" into jb-mr2-dev
* commit '1f75eb1eae4dde3e7d8c625fca3063cf5a488079':
  logwrapper: Add ability to log to kernel log
2013-04-15 10:35:32 -07:00
Ken Sumrall
3b0511788c am 774814d1: Merge "klog: Have klog_write() call klog_init() if needed" into jb-mr2-dev
* commit '774814d1940a87175fc7dc692fef5c626d893968':
  klog: Have klog_write() call klog_init() if needed
2013-04-15 10:35:31 -07:00
Ken Sumrall
1f75eb1eae Merge "logwrapper: Add ability to log to kernel log" into jb-mr2-dev 2013-04-15 17:33:44 +00:00
Ken Sumrall
774814d194 Merge "klog: Have klog_write() call klog_init() if needed" into jb-mr2-dev 2013-04-15 17:33:27 +00:00
Ken Sumrall
96e11b5bc4 logwrapper: Add ability to log to kernel log
Also add ability to do abbreviated logging where only the first
4K bytes and last 4K bytes of output are added to the desginated log.

Also update standalog logwrapper command to support the new options.

Change-Id: Ia49cbe58479b9f9ed077498d6852e20b21287bad
2013-04-14 17:10:55 -07:00
Dianne Hackborn
c08b50dfc6 am 24bc41b7: Add new resources trace.
* commit '24bc41b78ca004ac7a6873054ff919da1ba9a6f8':
  Add new resources trace.
2013-04-12 16:59:37 -07:00
Dianne Hackborn
24bc41b78c Add new resources trace.
Change-Id: I63398f282fe7bf04f1c4cefa8f602100f403fa7c
2013-04-12 14:51:43 -07:00
Ken Sumrall
7425fd1b23 klog: Have klog_write() call klog_init() if needed
Also change klog_init() to do nothing if already initialized.

Change-Id: Ia2dfe914c9d9fd119fb8939508d57b15c9884663
2013-04-11 20:03:47 -07:00
Ying Wang
821620f593 am c796ed97: We need libcutils to include liblog
* commit 'c796ed97466510dd5239008554decbe72825e19c':
  We need libcutils to include liblog
2013-04-11 15:57:35 -07:00
Ying Wang
c796ed9746 We need libcutils to include liblog
For some prebuilts were built against libcutils with liblog in it.
Unfortunately that means in the future if someone checks in prebuilts
that are built against libcutils and they don't explicitly link against
liblog, they will again prevent us from removing liblog from libcutils.

Bug: 8587800
Bug: 8580410
Change-Id: I2a5ed6233df7e7d542d1e4167bec405750c0e671
2013-04-10 17:33:48 -07:00
The Android Open Source Project
cdbddac7b6 Reconcile with jb-mr2-release - do not merge
Change-Id: I4e13e11a8c42a8b316f60e9d37170e4787643099
2013-04-10 10:06:09 -07:00
The Android Automerger
2c61db947a merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-10 05:56:59 -07:00
Ying Wang
129b6d907b am 083b5ccb: Add liblog
* commit '083b5ccba345ed2b4950454f16bd89c5d86b6b27':
  Add liblog
2013-04-09 22:29:03 -07:00
Ying Wang
083b5ccba3 Add liblog
Bug: 8580410
Change-Id: Iab3a9b4307f207c14a04a922cc7350c54e60e9ad
2013-04-09 22:03:45 -07:00
The Android Open Source Project
2e1be17560 Reconcile with jb-mr2-release - do not merge
Change-Id: I4d242b2cbadf2c9bcdeeff721a83528cd02b3c0e
2013-04-08 13:36:44 -07:00
The Android Automerger
1520fb4fa2 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-08 05:57:16 -07:00
Colin Cross
dd0a6cdf1f am 578b7473: Merge "libsparse: Fix null pointer issue"
* commit '578b74734c1cfc773f3213a23a7195aa4b5b97aa':
  libsparse: Fix null pointer issue
2013-04-06 12:51:36 -07:00
Colin Cross
d3859e433d am 6e0b9ecb: Merge "toolbox/dmesg: do not hardcode KLOG_BUF_LEN"
* commit '6e0b9ecb503b5611d815214e0a134ea0b1395089':
  toolbox/dmesg: do not hardcode KLOG_BUF_LEN
2013-04-06 12:51:35 -07:00
Colin Cross
578b74734c Merge "libsparse: Fix null pointer issue" 2013-04-06 19:03:02 +00:00
Colin Cross
6e0b9ecb50 Merge "toolbox/dmesg: do not hardcode KLOG_BUF_LEN" 2013-04-06 19:02:01 +00:00
Colin Cross
a5ca229a45 am 1615c09a: Merge "init: Fix potential null pointer issue"
* commit '1615c09ac1065104f56ddc444f5467aff76c0daa':
  init: Fix potential null pointer issue
2013-04-05 19:56:27 -07:00
Colin Cross
1615c09ac1 Merge "init: Fix potential null pointer issue" 2013-04-06 01:53:24 +00:00
Christopher Tate
2c1706675d am 7716aef1: Uploaded native crash dumps do not include memory contents
* commit '7716aef138e8029357a7b3dc6a73b41f4de4b0ad':
  Uploaded native crash dumps do not include memory contents
2013-04-05 16:35:47 -07:00
Christopher Tate
7716aef138 Uploaded native crash dumps do not include memory contents
Also fixed the LOG() macro to actually write to the log again, tracking
the change in _LOG() argument semantics.

Bug 8322568

Change-Id: I79330c85c26d3ffb734315b6d0f2c0bb80bd234a
2013-04-05 16:30:15 -07:00
Elliott Hughes
c3d750b74b am e5f8a692: Modify debuggerd to cope with the abort message.
* commit 'e5f8a692e44be89dc4c062517eadfb88184c4770':
  Modify debuggerd to cope with the abort message.
2013-04-05 16:04:12 -07:00
Elliott Hughes
e5f8a692e4 Modify debuggerd to cope with the abort message.
(cherry picked from commit 707b8bbe18)

Bug: 8531731
Change-Id: I2785a07ef83e085f338d3094f9972de23117807c
2013-04-05 15:59:17 -07:00
Elliott Hughes
8a4ae0a873 resolved conflicts for merge of f79c0518 to jb-mr2-dev-plus-aosp
Change-Id: I106a2aa7ec393a68e51132bf277b22bece155a8e
2013-04-05 13:46:55 -07:00
Jeff Sharkey
c307aa5f03 am b4d52a43: Only handle keycodes when adb is enabled.
* commit 'b4d52a437e97489710182ebc6a8a3e00d6fbd6f0':
  Only handle keycodes when adb is enabled.
2013-04-05 13:43:34 -07:00
Elliott Hughes
f79c05186f Merge "Modify debuggerd to cope with the abort message." 2013-04-05 18:27:38 +00:00
Keun-young Park
ca02a13690 am ad999a09: (-s ours) Merge "rootdir: goldfish: mount debugfs on boot time"
* commit 'ad999a09ab973c5ed5c54a78cdaa4dbc06eb485e':
  rootdir: goldfish: mount debugfs on boot time
2013-04-05 10:09:24 -07:00
Keun-young Park
ad999a09ab Merge "rootdir: goldfish: mount debugfs on boot time" 2013-04-05 16:19:20 +00:00
Geremy Condra
a7096004f2 am 911ba269: Merge "Add -i option to toolbox cmd ls"
* commit '911ba269e369035f9a4a250fa22233b37d724356':
  Add -i option to toolbox cmd ls
2013-04-04 23:42:16 -07:00
Geremy Condra
911ba269e3 Merge "Add -i option to toolbox cmd ls" 2013-04-05 00:08:19 +00:00
Elliott Hughes
707b8bbe18 Modify debuggerd to cope with the abort message.
Bug: 8531731
Change-Id: I416ec1da38a8a1b0d0a582ccd7c8aaa681ed4a29
2013-04-04 13:52:01 -07:00
Jeff Sharkey
b4d52a437e Only handle keycodes when adb is enabled.
This prevents accidental bugreports on userdebug/eng devices.

Bug: 8541006
Change-Id: Iefd15826090fd91434403f197cfd166e64400224
2013-04-04 10:46:33 -07:00
The Android Automerger
f2661be215 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-04 05:56:12 -07:00
William Roberts
403b195548 Add -i option to toolbox cmd ls
Change-Id: I4690fc10dc07bf1883bcf8ec18399235dc97d317
2013-04-03 17:39:19 -07:00
The Android Open Source Project
a7672f4247 Reconcile with jb-mr2-release - do not merge
Change-Id: I1442a44754b64c868210578faf00006c5aaa6b58
2013-04-03 16:43:51 -07:00
Brian Carlstrom
76c674451c Merge "resolved conflicts for merge of 02e8d730 to jb-mr2-dev-plus-aosp" into jb-mr2-dev-plus-aosp 2013-04-03 21:05:34 +00:00
Geremy Condra
977e1f263c am c1e47294: Merge "Give system ownership of selinux load and enforce files." into jb-mr2-dev
* commit 'c1e47294c9ca69f32bae24036eb0f19db3af7b2e':
  Give system ownership of selinux load and enforce files.
2013-04-03 14:03:21 -07:00
Geremy Condra
5fa4d26c57 am 8e15eabd: Apply the correct SELinux label for the properties workspace.
* commit '8e15eabdc0b40e68426eaf3179dc076d20df75b6':
  Apply the correct SELinux label for the properties workspace.
2013-04-03 14:03:21 -07:00
Brian Carlstrom
d3f0e0ae37 resolved conflicts for merge of 02e8d730 to jb-mr2-dev-plus-aosp
Change-Id: I63d6a2f975a6c0df5c238a2f7592f357441eb767
2013-04-03 14:03:13 -07:00
Geremy Condra
c1e47294c9 Merge "Give system ownership of selinux load and enforce files." into jb-mr2-dev 2013-04-03 20:59:33 +00:00
Brian Carlstrom
02e8d73079 Merge "Add OkHttp to the boot classpath." 2013-04-03 20:15:20 +00:00
Geremy Condra
8e15eabdc0 Apply the correct SELinux label for the properties workspace.
Change-Id: Ibb9c8044caa9d39ee6ec9fe06d54bb9dc4b56ff3
2013-04-03 11:59:56 -07:00
Geremy Condra
c2594f36e7 Give system ownership of selinux load and enforce files.
This is necessary to enable remote updates.

Change-Id: I05fb979c0360eca4cc6e4add48bb42f712a1ba17
2013-04-03 11:58:12 -07:00
The Android Automerger
f135302f31 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-03 06:03:00 -07:00
Mathias Agopian
145d61e0c7 am 69de9ac0: Merge "move tinyutils into its own namespace" into jb-mr2-dev
* commit '69de9ac00bd3db3bfdb04ac5686e4b2cbfc372b5':
  move tinyutils into its own namespace
2013-04-02 16:40:46 -07:00
jwilson
8637e8186a Add OkHttp to the boot classpath.
Change-Id: I185b803b5b804ff8680ef928ce5163727adbf0bd
2013-04-02 16:23:48 -07:00
Mathias Agopian
69de9ac00b Merge "move tinyutils into its own namespace" into jb-mr2-dev 2013-04-02 23:19:06 +00:00