Keun-young Park
dde7bfcb84
Merge "init: Do full shutdown even for thermal shutdown" into oc-dr1-dev am: b6962f2e44
-s ours
...
am: ffc080f5d8
-s ours
Change-Id: I4c55ee7052c309440d641398431d5d65e2e4c61b
2017-07-20 06:09:51 +00:00
Keun-young Park
ffc080f5d8
Merge "init: Do full shutdown even for thermal shutdown" into oc-dr1-dev
...
am: b6962f2e44
-s ours
Change-Id: I1b25c4a207802376d4dcdbd26e26535d5e6d1f37
2017-07-20 06:06:19 +00:00
TreeHugger Robot
b6962f2e44
Merge "init: Do full shutdown even for thermal shutdown" into oc-dr1-dev
2017-07-20 06:02:00 +00:00
Christopher Ferris
94d82567d1
Merge "Cleanup the libbacktrace interface a bit." am: e3d470b81d
am: 011f61f39d
am: 8c632cb59a
...
am: 718760c145
Change-Id: I984e38dd8791b1ab82693e67e6fafa594668aa75
2017-07-20 04:16:54 +00:00
Christopher Ferris
640d193186
Merge "Speed up StepIfSignalHandler path." am: c6dd6e8a79
am: df8362bae6
am: fade4fc5c6
...
am: 73fcac8765
Change-Id: Idba9eba2ecf2a7450ae1e4eb20494e2a9f712853
2017-07-20 04:16:27 +00:00
Christopher Ferris
718760c145
Merge "Cleanup the libbacktrace interface a bit." am: e3d470b81d
am: 011f61f39d
...
am: 8c632cb59a
Change-Id: I8724717bc0fe798337a36ec9f1f07405207f3a2a
2017-07-20 04:08:49 +00:00
Christopher Ferris
73fcac8765
Merge "Speed up StepIfSignalHandler path." am: c6dd6e8a79
am: df8362bae6
...
am: fade4fc5c6
Change-Id: Ic19c590b43081d9273977d830b4c33f911930e49
2017-07-20 04:08:24 +00:00
Christopher Ferris
8c632cb59a
Merge "Cleanup the libbacktrace interface a bit." am: e3d470b81d
...
am: 011f61f39d
Change-Id: Ib48f1f649de9cc660838d0883d9051d18ec0c2b9
2017-07-20 03:59:45 +00:00
Christopher Ferris
fade4fc5c6
Merge "Speed up StepIfSignalHandler path." am: c6dd6e8a79
...
am: df8362bae6
Change-Id: Icc16e28e36b88609e20cb5c479c387a2e6d6f73f
2017-07-20 03:59:19 +00:00
Christopher Ferris
011f61f39d
Merge "Cleanup the libbacktrace interface a bit."
...
am: e3d470b81d
Change-Id: Iba1db66328410d9f03660ddea89c2689dd938ebf
2017-07-20 03:53:52 +00:00
Christopher Ferris
df8362bae6
Merge "Speed up StepIfSignalHandler path."
...
am: c6dd6e8a79
Change-Id: Ie0d80840db92a7be958979785b75d3bf4077b030
2017-07-20 03:53:22 +00:00
Keun-young Park
7f6d920369
Merge "dump stack before kill all" into oc-dr1-dev am: 6a55adc92b
-s ours
...
am: 5360d86e53
-s ours
Change-Id: I52da746c65ffbf15d6130eefb9e788cdec535a71
2017-07-20 03:51:37 +00:00
Keun-young Park
5360d86e53
Merge "dump stack before kill all" into oc-dr1-dev
...
am: 6a55adc92b
-s ours
Change-Id: I655617676086e8add3f9cac63df82c62d744607d
2017-07-20 03:47:42 +00:00
Christopher Ferris
e3d470b81d
Merge "Cleanup the libbacktrace interface a bit."
2017-07-20 03:45:06 +00:00
Christopher Ferris
c6dd6e8a79
Merge "Speed up StepIfSignalHandler path."
2017-07-20 03:43:19 +00:00
TreeHugger Robot
6a55adc92b
Merge "dump stack before kill all" into oc-dr1-dev
2017-07-20 03:38:56 +00:00
Keun-young Park
cfa0a9524b
Merge "init: Do full shutdown even for thermal shutdown" am: d5b36f38ef
am: a064892e1a
am: 614ccd7a02
...
am: 44dce1fed7
Change-Id: I1a01555d98864bd13695524e0cb5adff9b49b754
2017-07-20 03:36:25 +00:00
Luke Song
cfe282d570
Merge "resolve merge conflicts of 74a5f22d9
to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp
...
am: 1bc31284fa
Change-Id: I88dbbc655a602979a46736c59996dda00f0dfee1
2017-07-20 03:36:07 +00:00
Keun-young Park
44dce1fed7
Merge "init: Do full shutdown even for thermal shutdown" am: d5b36f38ef
am: a064892e1a
...
am: 614ccd7a02
Change-Id: Id714910ec5bdf4b94bfeee238484f4d47a9bdf01
2017-07-20 03:33:42 +00:00
Keun-young Park
614ccd7a02
Merge "init: Do full shutdown even for thermal shutdown" am: d5b36f38ef
...
am: a064892e1a
Change-Id: Ia6ddd5a680caa8283cf9d2a75c1eb49e1c79e413
2017-07-20 03:30:39 +00:00
TreeHugger Robot
1bc31284fa
Merge "resolve merge conflicts of 74a5f22d9
to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp
2017-07-20 03:29:27 +00:00
Keun-young Park
a064892e1a
Merge "init: Do full shutdown even for thermal shutdown"
...
am: d5b36f38ef
Change-Id: If0bcd287d2656279a1d364761b0145ca4464299b
2017-07-20 03:27:38 +00:00
Treehugger Robot
d5b36f38ef
Merge "init: Do full shutdown even for thermal shutdown"
2017-07-20 03:21:41 +00:00
Bowgo Tsai
2e774b01f8
Merge "fs_mgr_verity: allow verification error when the device is unlocked" am: a68f633675
am: 84937296c6
am: e5de94756b
...
am: 2e19aa92ed
Change-Id: If3779eceac8084723c101a6f7fa9091c4f09128e
2017-07-20 02:03:34 +00:00
Bowgo Tsai
2e19aa92ed
Merge "fs_mgr_verity: allow verification error when the device is unlocked" am: a68f633675
am: 84937296c6
...
am: e5de94756b
Change-Id: Iedca76aea1c93320bbba29bcd013d1cd331380de
2017-07-20 02:01:05 +00:00
Bowgo Tsai
e5de94756b
Merge "fs_mgr_verity: allow verification error when the device is unlocked" am: a68f633675
...
am: 84937296c6
Change-Id: Ia71076213c9a6770ff35b999024b1d223c82bd77
2017-07-20 01:58:05 +00:00
Bowgo Tsai
84937296c6
Merge "fs_mgr_verity: allow verification error when the device is unlocked"
...
am: a68f633675
Change-Id: Iba60c7f544ae86a1487354a9e799cab7167f37ad
2017-07-20 01:55:04 +00:00
Treehugger Robot
a68f633675
Merge "fs_mgr_verity: allow verification error when the device is unlocked"
2017-07-20 01:48:34 +00:00
Keun-young Park
c111537f5d
init: Do full shutdown even for thermal shutdown
...
- Skipping SIGTERM / SIGKILL / umount brings race between block
device driver and fs layer. Do umount before shutting down.
- Reduce timeout to 1 sec for thermal shutdown and skip other time
taking part like fsck.
- Refactor waiting part to check time in ms so that 1 sec can
have enough resolution.
bug: 63686426
Test: adb shell setprop sys.powerctl thermal-shutdown, adb shell setprop sys.powerctl reboot and check dmesg
Merged-In: I048bac767b328c8d656a97fe65dde5f2b5bf4ae5
Change-Id: I048bac767b328c8d656a97fe65dde5f2b5bf4ae5
2017-07-19 18:38:20 -07:00
Tom Cherry
1bd7187f32
Merge "ueventd: fixup ueventd_test.cpp" am: 9aaf66b61f
am: 34d4d57b87
am: 5d256bc555
...
am: 5b1202976e
Change-Id: Icf00ff2e4f9a949900ab6b71bba89c3815c4b5d2
2017-07-20 01:26:25 +00:00
Luke Song
23471afe84
resolve merge conflicts of 74a5f22d9
to oc-dr1-dev-plus-aosp
...
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Iad367b2998311e327151dbd8e9295259f6661f77
2017-07-19 18:25:51 -07:00
Tom Cherry
5b1202976e
Merge "ueventd: fixup ueventd_test.cpp" am: 9aaf66b61f
am: 34d4d57b87
...
am: 5d256bc555
Change-Id: I430e26f820653edfe35ededffa853dcf5e1324ad
2017-07-20 01:20:30 +00:00
Tom Cherry
5d256bc555
Merge "ueventd: fixup ueventd_test.cpp" am: 9aaf66b61f
...
am: 34d4d57b87
Change-Id: I7468e871785ea74e6cd5b070bd6f18153f6304a7
2017-07-20 01:17:31 +00:00
Tom Cherry
34d4d57b87
Merge "ueventd: fixup ueventd_test.cpp"
...
am: 9aaf66b61f
Change-Id: I7792c9ec68b6011e0186af2d40ca07d0801a4c2f
2017-07-20 01:15:00 +00:00
Tom Cherry
9aaf66b61f
Merge "ueventd: fixup ueventd_test.cpp"
2017-07-20 01:05:28 +00:00
Luke Song
74a5f22d9f
Merge "healthd: restructure healthd_mode_charger" into oc-dr1-dev
2017-07-20 01:02:06 +00:00
Luke Song
e214caef46
Merge "healthd: restructure healthd_mode_charger"
2017-07-20 00:55:18 +00:00
Keun-young Park
30173874fc
init: Do full shutdown even for thermal shutdown
...
- Skipping SIGTERM / SIGKILL / umount brings race between block
device driver and fs layer. Do umount before shutting down.
- Reduce timeout to 1 sec for thermal shutdown and skip other time
taking part like fsck.
- Refactor waiting part to check time in ms so that 1 sec can
have enough resolution.
bug: 63686426
Test: adb shell setprop sys.powerctl thermal-shutdown, adb shell setprop sys.powerctl reboot and check dmesg
Change-Id: I048bac767b328c8d656a97fe65dde5f2b5bf4ae5
2017-07-19 17:27:05 -07:00
Keun-young Park
366c51ec1e
dump stack before kill all
...
- If problematic process is from user, kill all kills
it and dump does not show problematic process.
bug: 37737296
Test: reboot and check log
Merged-In: Iaa4f7d12f5a40fa7528c6672567c36e30b140372
Change-Id: Iaa4f7d12f5a40fa7528c6672567c36e30b140372
2017-07-19 17:11:36 -07:00
TreeHugger Robot
ac5e72fc56
Merge "fastboot: add mke2fs and e2fsdroid to build package"
2017-07-20 00:10:53 +00:00
Luke Song
1d540dd0f4
healthd: restructure healthd_mode_charger
...
Refactor drawing code into separate class, and allow for split screen
drawing with offset.
Cherry picked from commit 7f386dcab9
Bug: 63541890
Test: Verify charging mode animation
Change-Id: I6c089460f55b8c2f75f4aa3153a5736f6f434b51
2017-07-19 22:46:54 +00:00
Christopher Ferris
96722b0fa4
Cleanup the libbacktrace interface a bit.
...
- Change the field name load_base to load_bias (which is what it really is).
- Add a rel_pc field so that callers do not need to compute it themselves.
- Remove the BacktraceMap::GetRelativePc() since nobody should need to
compute this themselves.
Bug: 23762183
Test: Compiles and unit tests pass (debuggerd, libbacktrace).
Change-Id: I2cb579767120adf08c407a58f3c487ee3f2b45fc
2017-07-19 15:36:32 -07:00
Keun-young Park
d4f4a3fcf9
Merge "dump stack before kill all" am: c13a2da2f4
am: 4e24aa2bc3
am: 2b33d96db1
...
am: f0a13c35f2
Change-Id: Id42c59a6488a9405c8f3301585d2b8cb18192197
2017-07-19 22:32:50 +00:00
Keun-young Park
f0a13c35f2
Merge "dump stack before kill all" am: c13a2da2f4
am: 4e24aa2bc3
...
am: 2b33d96db1
Change-Id: Ic9c86ce7ddf8591a9fb2d3b1cdf72057c21d4111
2017-07-19 22:29:51 +00:00
Tom Cherry
2ef572be30
ueventd: fixup ueventd_test.cpp
...
Use ASSERT_EQ() instead of EXPECT_EQ() to prevent segfaults after
failed API calls.
Do not run setfscreatecon_IsPerThread unless we're in permissive mode
as it will not pass otherwise.
Test: init unit tests
Change-Id: I70525d438e89f1ec036255890169a50b5007b4c4
2017-07-19 15:29:20 -07:00
Keun-young Park
2b33d96db1
Merge "dump stack before kill all" am: c13a2da2f4
...
am: 4e24aa2bc3
Change-Id: If924fe081a81c2061ed06e741fc5e6984e24b1f9
2017-07-19 22:26:22 +00:00
Keun-young Park
4e24aa2bc3
Merge "dump stack before kill all"
...
am: c13a2da2f4
Change-Id: Ie09fd8a7e95686c41d2a7af9e9e291f89c673036
2017-07-19 22:23:48 +00:00
Jin Qian
6ce78321a2
fastboot: add mke2fs and e2fsdroid to build package
...
Bug: 23686092
Bug: 63849632
Change-Id: Iff0d92b7174597d43ee646847888aedc2080052a
2017-07-19 15:21:15 -07:00
Keun-young Park
c13a2da2f4
Merge "dump stack before kill all"
2017-07-19 22:17:06 +00:00
Christopher Ferris
eb4a6dbf5c
Speed up StepIfSignalHandler path.
...
The StepIfSignalHandler code reads from the process memory object, which
is currently the slowest way to read memory. Change the code to read from
the elf memory object which will almost always be a memory mapped file and
should be really fast.
Also, move the tests for StepIfSignalHandler to its own file.
Bug: 23762183
Test: Unit tests pass.
Change-Id: I1100b50554e5ef736a87babd484f3f34e9071caa
2017-07-19 21:35:46 +00:00