Colin Cross
ad0711b520
Merge "Fix stack test on arm32" am: 7ff1eb698c
...
am: 53e56177b5
2017-06-23 00:44:44 +00:00
Colin Cross
53e56177b5
Merge "Fix stack test on arm32"
...
am: 7ff1eb698c
2017-06-23 00:40:07 +00:00
Treehugger Robot
7ff1eb698c
Merge "Fix stack test on arm32"
2017-06-23 00:31:44 +00:00
Colin Cross
f2da40d42c
Merge "libmemunreachable: turn off MEM_ALOGV messages" am: 52998574d1
...
am: 771be4c2ad
2017-06-22 23:09:33 +00:00
Colin Cross
771be4c2ad
Merge "libmemunreachable: turn off MEM_ALOGV messages"
...
am: 52998574d1
2017-06-22 23:04:10 +00:00
Treehugger Robot
52998574d1
Merge "libmemunreachable: turn off MEM_ALOGV messages"
2017-06-22 22:53:50 +00:00
Colin Cross
9d6100e049
Merge "Move libmemunreachable into namespace android" am: ae38b373a5
...
am: cd652f2159
2017-06-22 22:53:13 +00:00
Colin Cross
cd652f2159
Merge "Move libmemunreachable into namespace android"
...
am: ae38b373a5
2017-06-22 22:49:15 +00:00
Treehugger Robot
ae38b373a5
Merge "Move libmemunreachable into namespace android"
2017-06-22 22:37:43 +00:00
Colin Cross
76464d958b
Fix stack test on arm32
...
The stack test puts a pointer to an allocation on the stack, checks
that there are no leaks, then lets it go out of scope and checks
that libmemunreachable can find a leak. This works on arm64, but
on arm32 the pointer on the stack doesn't get overwitten and the
leak is not detected. Rewrite the pointer to be NULL instead.
Test: memunreachable_test
Change-Id: I5959a34cbb572a5d8670270077a85d247a3a4880
2017-06-22 14:21:52 -07:00
Colin Cross
786b46347d
Merge "libmemunreachable: clang-format everything" am: 75752c1911
...
am: 8f596198ed
2017-06-22 21:08:26 +00:00
Colin Cross
8f596198ed
Merge "libmemunreachable: clang-format everything"
...
am: 75752c1911
2017-06-22 21:04:47 +00:00
Colin Cross
75752c1911
Merge "libmemunreachable: clang-format everything"
2017-06-22 20:57:03 +00:00
Colin Cross
f3ce8bc8ae
libmemunreachable: turn off MEM_ALOGV messages
...
The move to async safe logging in I3d3b2111f6f6bf8a0d7039295d34d5168c191651
caused MEM_ALOGV messages to print even when NDEBUG was set.
Test: builds
Change-Id: Ibebe69d8c96f8f2556991c1eb5446a77782d43c7
2017-06-22 13:46:56 -07:00
Colin Cross
a9939e9a23
Move libmemunreachable into namespace android
...
Putting libmemunreachable in the global C++ namespace was an oversight,
move it into namespace android.
Test: m -j checkbuild
Change-Id: I0799906f6463178cb04a719bb4054cad33a50dbe
2017-06-22 10:58:23 -07:00
Colin Cross
a83881e33c
libmemunreachable: clang-format everything
...
clang-format -i --sort-includes $(find . -name "*.cpp" -o -name "*.h")
Test: builds
Change-Id: Ia8e0677fe7f3f26dddba3a851cd2dfab9f14e421
2017-06-22 10:58:05 -07:00
Narayan Kamath
b5018b9fea
Merge "tombstoned: change path for traces from "anr_" to "trace_"" am: 07a57f0f28
...
am: c01e0d98f7
2017-06-22 08:38:55 +00:00
Narayan Kamath
c01e0d98f7
Merge "tombstoned: change path for traces from "anr_" to "trace_""
...
am: 07a57f0f28
2017-06-22 08:35:26 +00:00
Narayan Kamath
07a57f0f28
Merge "tombstoned: change path for traces from "anr_" to "trace_""
2017-06-22 08:30:42 +00:00
Logan Chien
3d2e04f0cb
Merge "ld-config: Add HIDL memory libs to VNDK-SP" into oc-dev
...
am: 86530fac97
2017-06-22 05:12:51 +00:00
Logan Chien
811e980ad9
ld-config: Add HIDL memory libs to VNDK-SP
...
am: ea2719f9f1
2017-06-22 05:11:58 +00:00
TreeHugger Robot
86530fac97
Merge "ld-config: Add HIDL memory libs to VNDK-SP" into oc-dev
2017-06-22 05:07:14 +00:00
Sandeep Patil
91b5f4b172
Merge changes from topic 'eng_first_stage_mount' am: b7e2f272ee
...
am: e5341cf56a
2017-06-22 00:08:17 +00:00
Sandeep Patil
e5341cf56a
Merge changes from topic 'eng_first_stage_mount'
...
am: b7e2f272ee
2017-06-22 00:05:18 +00:00
Treehugger Robot
b7e2f272ee
Merge changes from topic 'eng_first_stage_mount'
...
* changes:
Revert "Revert "init: poll in first stage mount if required devices are not found""
Revert "Revert "ueventd: remove PlatformDeviceList""
fs_mgr: differentiate if fs_mgr_set_verity() was skipped or disabled
2017-06-21 23:55:52 +00:00
Elliott Hughes
4982d2b1d4
Merge "Decode ptrace-induced SIGTRAP si_code values." am: 293936e41c
...
am: a3cdfc930a
2017-06-21 22:12:20 +00:00
Elliott Hughes
a3cdfc930a
Merge "Decode ptrace-induced SIGTRAP si_code values."
...
am: 293936e41c
2017-06-21 22:08:06 +00:00
Sandeep Patil
4cbedee541
Revert "Revert "init: poll in first stage mount if required devices are not found""
...
This reverts commit d6fccea093
2017-06-21 15:04:57 -07:00
Sandeep Patil
cd2ba0d184
Revert "Revert "ueventd: remove PlatformDeviceList""
...
This reverts commit 516ff99711
2017-06-21 15:04:57 -07:00
Sandeep Patil
95366e97dd
fs_mgr: differentiate if fs_mgr_set_verity() was skipped or disabled
...
In case of non-secure builds (eng variant) fs_mgr_setup_verity() skips
verity checks regardless of fstab options. This is slightly different
than 'adb disable-verity' where it would first read the verity metadata
to check if verity is disabled.
So, this change adds a new return value of FS_MGR_SETUP_VERITY_SKIPPED
instead of piggy backing on the FS_MGR_SETUP_VERITY_DISABLED.
Bug: 62864413
Test: Boot sailfish
Change-Id: I42bf2bdce0ecb18b4c3b568e2bc96bf1590dfb35
Signed-off-by: Sandeep Patil <sspatil@google.com>
2017-06-21 15:04:46 -07:00
Treehugger Robot
293936e41c
Merge "Decode ptrace-induced SIGTRAP si_code values."
2017-06-21 21:59:25 +00:00
TreeHugger Robot
e3ae43e897
Merge "ld-config: Add HIDL memory libs to VNDK-SP" into oc-dev-plus-aosp
2017-06-21 20:28:39 +00:00
Yueyao Zhu
8e5671f55c
Merge "healthd: add battery health status values from JEITA spec" am: 5dd87c4ef6
...
am: 7a79592e4e
2017-06-21 19:29:25 +00:00
Yueyao Zhu
7a79592e4e
Merge "healthd: add battery health status values from JEITA spec"
...
am: 5dd87c4ef6
2017-06-21 19:27:55 +00:00
Treehugger Robot
5dd87c4ef6
Merge "healthd: add battery health status values from JEITA spec"
2017-06-21 19:11:45 +00:00
Tom Cherry
e6699f4507
Merge "Revert "ueventd: remove PlatformDeviceList"" am: 9c5f614945
...
am: b0350407f0
2017-06-21 19:00:15 +00:00
Tom Cherry
4ee2b6feee
Merge "Revert "init: poll in first stage mount if required devices are not found"" am: c9a27f79ad
...
am: 57579dd8c9
2017-06-21 18:59:53 +00:00
Tom Cherry
b0350407f0
Merge "Revert "ueventd: remove PlatformDeviceList""
...
am: 9c5f614945
2017-06-21 18:57:43 +00:00
Tom Cherry
57579dd8c9
Merge "Revert "init: poll in first stage mount if required devices are not found""
...
am: c9a27f79ad
2017-06-21 18:57:21 +00:00
Tom Cherry
9c5f614945
Merge "Revert "ueventd: remove PlatformDeviceList""
2017-06-21 18:42:22 +00:00
Tom Cherry
516ff99711
Revert "ueventd: remove PlatformDeviceList"
...
Bug: 62864413
This reverts commit c94ce7b130
2017-06-21 18:42:07 +00:00
Tom Cherry
c9a27f79ad
Merge "Revert "init: poll in first stage mount if required devices are not found""
2017-06-21 18:41:57 +00:00
Tom Cherry
d6fccea093
Revert "init: poll in first stage mount if required devices are not found"
...
Bug: 62864413
This reverts commit ccf0d39316
2017-06-21 18:40:58 +00:00
Tom Cherry
152f4f4dad
Merge "Revert "ueventd: remove PlatformDeviceList"" into oc-dev
...
am: fef83abd89
2017-06-21 18:33:51 +00:00
Tom Cherry
a890341850
Revert "init: poll in first stage mount if required devices are not found"
...
am: 0e63e61eb5
2017-06-21 18:31:20 +00:00
Tom Cherry
fef83abd89
Merge "Revert "ueventd: remove PlatformDeviceList"" into oc-dev
2017-06-21 18:18:24 +00:00
Tom Cherry
f520e44c4c
Revert "ueventd: remove PlatformDeviceList"
...
Bug: 62864413
This reverts commit d43b615216
2017-06-21 18:10:53 +00:00
Tom Cherry
0e63e61eb5
Revert "init: poll in first stage mount if required devices are not found"
...
Bug: 62864413
This reverts commit 5f4e8eac8a
2017-06-21 18:10:47 +00:00
Narayan Kamath
b123220dd6
tombstoned: change path for traces from "anr_" to "trace_"
...
The only case where tombstoned creates files for java traces is
when the process is signalled "by hand" using "shell kill -3", or
by the program itself. Such traces do not correspond to an ANR, so
name those files "trace_XX".
When dumpstate / system_server want to dump java traces, they set up
a tombstoned intercept and manage the lifetime of any associated file
that themselves.
Bug: 32064548
Test: manual, debuggerd_test
Change-Id: I97006ec7c0cd35de4b9564f535e77af846cc3891
2017-06-21 18:00:09 +01:00
Elliott Hughes
336a52e00c
Decode ptrace-induced SIGTRAP si_code values.
...
Example:
signal 5 (SIGTRAP), code -32763 (PTRACE_EVENT_STOP), fault addr 0x274e00005fb3
I'm tempted to say that %d isn't the best choice for si_code, but as long as
we're fully decoding all the values, I don't think it matters.
Bug: http://b/62856172
Test: manual debuggerd run
Change-Id: Ieeca690828e1e12f4162bbadece53f4aa7b9537a
2017-06-21 08:45:33 -07:00
