The Android Open Source Project
5cad711976
am 2e1be175
: Reconcile with jb-mr2-release - do not merge
...
* commit '2e1be1756081ef7300c42f2e7906c316539d7930':
2013-04-08 13:40:28 -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
7066da4ea9
am dd0a6cdf
: am 578b7473
: Merge "libsparse: Fix null pointer issue"
...
* commit 'dd0a6cdf1f88fcbe16070f678911702c81c4fd4a':
libsparse: Fix null pointer issue
2013-04-06 12:56:31 -07:00
Colin Cross
58b0642abb
am d3859e43
: am 6e0b9ecb
: Merge "toolbox/dmesg: do not hardcode KLOG_BUF_LEN"
...
* commit 'd3859e433d5a4e0da3f24851c5f5f6c9c8b97849':
toolbox/dmesg: do not hardcode KLOG_BUF_LEN
2013-04-06 12:56:31 -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
3be5c95d5f
am a5ca229a
: am 1615c09a
: Merge "init: Fix potential null pointer issue"
...
* commit 'a5ca229a4571f6df42c96e760257b7ca95c7fdeb':
init: Fix potential null pointer issue
2013-04-05 19:58:39 -07: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
30874aff27
am 2c170667
: am 7716aef1
: Uploaded native crash dumps do not include memory contents
...
* commit '2c1706675dfcab3205f4e065b63a5cef8acc3668':
Uploaded native crash dumps do not include memory contents
2013-04-05 16:39:02 -07: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
c44e1f84c2
am c3d750b7
: am e5f8a692
: Modify debuggerd to cope with the abort message.
...
* commit 'c3d750b74b7bd2760d6359e0e10e1320276b5ca6':
Modify debuggerd to cope with the abort message.
2013-04-05 16:07:14 -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
879d21ebc3
am 8a4ae0a8
: resolved conflicts for merge of f79c0518
to jb-mr2-dev-plus-aosp
...
* commit '8a4ae0a873862ea0a4764cd3492467843485f1e5':
Modify debuggerd to cope with the abort message.
2013-04-05 14:36:51 -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
09e534931a
am c307aa5f
: am b4d52a43
: Only handle keycodes when adb is enabled.
...
* commit 'c307aa5f038cea2a0fb5bb535f5930758bdfbb81':
Only handle keycodes when adb is enabled.
2013-04-05 13:46:43 -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
d8ded8e941
am ca02a136
: am ad999a09
: (-s ours) Merge "rootdir: goldfish: mount debugfs on boot time"
...
* commit 'ca02a136902ba44c64e90c87dd3be82a0ca7877f':
rootdir: goldfish: mount debugfs on boot time
2013-04-05 10:13:32 -07: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
e5920ffdca
am a7096004
: am 911ba269
: Merge "Add -i option to toolbox cmd ls"
...
* commit 'a7096004f220dd7578d7b2e26a3513fa5efc0fc1':
Add -i option to toolbox cmd ls
2013-04-04 23:46:55 -07: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
The Android Open Source Project
7d960c9618
am a7672f42
: Reconcile with jb-mr2-release - do not merge
...
* commit 'a7672f42478fae4150b32e5210fc6eb8f1b17bb1':
2013-04-03 18:05:31 -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
294c9ce217
am 76c67445
: Merge "resolved conflicts for merge of 02e8d730
to jb-mr2-dev-plus-aosp" into jb-mr2-dev-plus-aosp
...
* commit '76c674451c831c1e9c3e3ee134ea8af26ae19ac1':
Add OkHttp to the boot classpath.
2013-04-03 14:12:25 -07:00
Geremy Condra
709928de49
am 977e1f26
: am c1e47294
: Merge "Give system ownership of selinux load and enforce files." into jb-mr2-dev
...
* commit '977e1f263cee9023baf12cb430b5547e415e763e':
Give system ownership of selinux load and enforce files.
2013-04-03 14:12:23 -07:00
Geremy Condra
4042393454
am 5fa4d26c
: am 8e15eabd
: Apply the correct SELinux label for the properties workspace.
...
* commit '5fa4d26c572ca130f7c99040149e8aa7122888a5':
Apply the correct SELinux label for the properties workspace.
2013-04-03 14:12:23 -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
Geremy Condra
d701099cd1
Merge "Apply the correct SELinux label for the properties workspace."
2013-04-03 00:19:48 +00:00
Geremy Condra
78c8f3577e
Apply the correct SELinux label for the properties workspace.
...
Change-Id: Ibb9c8044caa9d39ee6ec9fe06d54bb9dc4b56ff3
2013-04-02 17:01:55 -07:00
Mathias Agopian
c43d6185bd
am 145d61e0
: am 69de9ac0
: Merge "move tinyutils into its own namespace" into jb-mr2-dev
...
* commit '145d61e0c7f2584c65d6eb454496013408d707af':
move tinyutils into its own namespace
2013-04-02 16:45:17 -07:00