Yifan Hong
2763df8eae
Implement android.hardware.health@2.0.
...
healthd_common.cpp uses health@2.0 for health@2.0-service
and healthd.
charger and recovery will be fixed in a follow up change.
(They still use libbatterymonitor for now).
Test: adb logcat -e "health@2.0"
Test: adb shell lshal --debug
Change-Id: I9ff0691d467df37118d7f143693c1bcd17a5bcbf
2017-10-06 15:29:59 -07:00
TreeHugger Robot
0e5361be31
Merge "libbatterymonitor: vendor_available"
2017-10-06 22:05:05 +00:00
James Hawkins
8289098f37
Merge "libmetricslogger: Fix the out-of-sync proto IDs for boot reason." am: 732003429e am: add19af4f7 am: 06e0c62cb4
...
am: 336759767e
2017-10-06 22:04:43 +00:00
James Hawkins
336759767e
Merge "libmetricslogger: Fix the out-of-sync proto IDs for boot reason." am: 732003429e am: add19af4f7
...
am: 06e0c62cb4
2017-10-06 21:55:44 +00:00
James Hawkins
06e0c62cb4
Merge "libmetricslogger: Fix the out-of-sync proto IDs for boot reason." am: 732003429e
...
am: add19af4f7
2017-10-06 21:48:32 +00:00
James Hawkins
add19af4f7
Merge "libmetricslogger: Fix the out-of-sync proto IDs for boot reason."
...
am: 732003429e
2017-10-06 21:41:54 +00:00
James Hawkins
732003429e
Merge "libmetricslogger: Fix the out-of-sync proto IDs for boot reason."
2017-10-06 21:33:58 +00:00
James Hawkins
f01dbc30ef
libmetricslogger: Fix the out-of-sync proto IDs for boot reason.
...
Long-term fix is to generate from proto directly. b/65625014
Bug: 67508816
Test: None
Change-Id: Ifa671fa5d3816807836fd18cd66a12a7caebb5a1
2017-10-06 14:30:08 -07:00
Tom Cherry
249648a02e
Merge "init: use ro.init.subcontexts_enabled to enable subcontexts" am: 99016bce92 am: 2f5b8bb3f0 am: 16d1488614
...
am: 3bcda2413c
2017-10-06 20:52:54 +00:00
Tom Cherry
3bcda2413c
Merge "init: use ro.init.subcontexts_enabled to enable subcontexts" am: 99016bce92 am: 2f5b8bb3f0
...
am: 16d1488614
2017-10-06 20:43:37 +00:00
Tom Cherry
16d1488614
Merge "init: use ro.init.subcontexts_enabled to enable subcontexts" am: 99016bce92
...
am: 2f5b8bb3f0
2017-10-06 20:36:56 +00:00
Tom Cherry
2f5b8bb3f0
Merge "init: use ro.init.subcontexts_enabled to enable subcontexts"
...
am: 99016bce92
2017-10-06 20:27:05 +00:00
Tom Cherry
99016bce92
Merge "init: use ro.init.subcontexts_enabled to enable subcontexts"
2017-10-06 20:12:53 +00:00
Jaegeuk Kim
0f61010994
init/reboot: call MNT_FORCE at the last umount(2) am: bf141af6be -s ours
...
am: dc73f5a669
2017-10-06 20:06:37 +00:00
Mark Salyzyn
f4120ed5b4
Merge "bootstat: system_boot_reason does not handle reboot_<reason> case" am: 0f058759b0 am: fc3f7ec5c3 am: 5cdd1f590a
...
am: 6541276217
2017-10-06 20:05:24 +00:00
Yifan Hong
ffff9aae02
libbatterymonitor: vendor_available
...
libbatterymonitor is a static library.
Also removed unused libbinder dependency.
Test: pass
Change-Id: I1f17ee643e6ed1bb2c11a6f3189a448dba2927ac
2017-10-06 13:05:19 -07:00
Jaegeuk Kim
dc73f5a669
init/reboot: call MNT_FORCE at the last umount(2)
...
am: bf141af6be
2017-10-06 19:55:47 +00:00
Mark Salyzyn
6541276217
Merge "bootstat: system_boot_reason does not handle reboot_<reason> case" am: 0f058759b0 am: fc3f7ec5c3
...
am: 5cdd1f590a
2017-10-06 18:24:37 +00:00
Mark Salyzyn
5cdd1f590a
Merge "bootstat: system_boot_reason does not handle reboot_<reason> case" am: 0f058759b0
...
am: fc3f7ec5c3
2017-10-06 18:17:37 +00:00
Mark Salyzyn
fc3f7ec5c3
Merge "bootstat: system_boot_reason does not handle reboot_<reason> case"
...
am: 0f058759b0
2017-10-06 18:13:11 +00:00
Mark Salyzyn
0f058759b0
Merge "bootstat: system_boot_reason does not handle reboot_<reason> case"
2017-10-06 18:07:55 +00:00
Tom Cherry
79193a42e7
init: use ro.init.subcontexts_enabled to enable subcontexts
...
As SEPolicy is developed, use this property to enable/disable
subcontexts.
Bug: 62875318
Test: boot device with/without subcontexts
Change-Id: Ieb879836a71c72d4de1bb16514d083d52480bf9a
2017-10-06 10:37:09 -07:00
Christopher Ferris
423054ddde
Merge "Use Unwinder object for unwind tool." am: 283ca30651 am: 791af78e96 am: 1f40228d64
...
am: b0ea03e3bf
2017-10-06 17:30:58 +00:00
Christopher Ferris
b0ea03e3bf
Merge "Use Unwinder object for unwind tool." am: 283ca30651 am: 791af78e96
...
am: 1f40228d64
2017-10-06 17:25:22 +00:00
Christopher Ferris
1f40228d64
Merge "Use Unwinder object for unwind tool." am: 283ca30651
...
am: 791af78e96
2017-10-06 17:21:18 +00:00
Christopher Ferris
791af78e96
Merge "Use Unwinder object for unwind tool."
...
am: 283ca30651
2017-10-06 17:17:01 +00:00
Christopher Ferris
283ca30651
Merge "Use Unwinder object for unwind tool."
2017-10-06 17:08:30 +00:00
Christopher Ferris
ae3b136506
Use Unwinder object for unwind tool.
...
Test: Ran unwind on arm and arm64 processes.
Change-Id: I8a2a3ed31482044fe51d7e0d8c7f5588d5aad81c
2017-10-05 16:05:44 -07:00
Mark Salyzyn
0af71a5327
bootstat: system_boot_reason does not handle reboot_<reason> case
...
Heuristic would translate reboot_<reason> to reboot._<reason>. Add
checking/squashing for leading comma (,) _or_ underscore (_).
Test: compile
Bug: 63736262
Change-Id: I7ef4930ec8c064a8151183ac08d292931a8584c8
2017-10-05 14:42:08 -07:00
Christopher Ferris
23da0b87d0
Merge "Update the Unwinder object and add tests." am: 9e6c11da18 am: 18d4e59725 am: e920ea8174
...
am: 572aa4c4bb
2017-10-05 21:14:04 +00:00
Christopher Ferris
572aa4c4bb
Merge "Update the Unwinder object and add tests." am: 9e6c11da18 am: 18d4e59725
...
am: e920ea8174
2017-10-05 21:06:55 +00:00
Christopher Ferris
e920ea8174
Merge "Update the Unwinder object and add tests." am: 9e6c11da18
...
am: 18d4e59725
2017-10-05 21:00:51 +00:00
Christopher Ferris
18d4e59725
Merge "Update the Unwinder object and add tests."
...
am: 9e6c11da18
2017-10-05 20:55:01 +00:00
Christopher Ferris
9e6c11da18
Merge "Update the Unwinder object and add tests."
2017-10-05 20:46:01 +00:00
Jaegeuk Kim
a2e26bf191
Merge "init/reboot: call MNT_FORCE at the last umount(2)" am: 4e008547be am: eacc9cd637 am: 647a720ee1
...
am: fd1852728b
2017-10-05 20:45:24 +00:00
Jaegeuk Kim
fd1852728b
Merge "init/reboot: call MNT_FORCE at the last umount(2)" am: 4e008547be am: eacc9cd637
...
am: 647a720ee1
2017-10-05 20:43:55 +00:00
Jaegeuk Kim
647a720ee1
Merge "init/reboot: call MNT_FORCE at the last umount(2)" am: 4e008547be
...
am: eacc9cd637
2017-10-05 20:40:54 +00:00
Jaegeuk Kim
eacc9cd637
Merge "init/reboot: call MNT_FORCE at the last umount(2)"
...
am: 4e008547be
2017-10-05 20:38:10 +00:00
Jaegeuk Kim
bf141af6be
init/reboot: call MNT_FORCE at the last umount(2)
...
The last one will avoid errors=panic in ext4.
Bug: 63981945
Bug: 65481582
Change-Id: I9c86afcce441767e24fc43668ab1ff6230155a9f
Merged-In: I9c86afcce441767e24fc43668ab1ff6230155a9f
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
(cherry picked from commit 0f04f72c2d
2017-10-05 13:34:44 -07:00
Jaegeuk Kim
4e008547be
Merge "init/reboot: call MNT_FORCE at the last umount(2)"
2017-10-05 20:32:14 +00:00
Lorenzo Colitti
b788319328
Merge "Stop depending on libnl." am: 445674ab7c am: ebef33b85a am: b451f4a9d7
...
am: df0df2455f
2017-10-05 09:59:52 +00:00
Lorenzo Colitti
df0df2455f
Merge "Stop depending on libnl." am: 445674ab7c am: ebef33b85a
...
am: b451f4a9d7
2017-10-05 09:53:30 +00:00
Lorenzo Colitti
b451f4a9d7
Merge "Stop depending on libnl." am: 445674ab7c
...
am: ebef33b85a
2017-10-05 09:49:58 +00:00
Lorenzo Colitti
ebef33b85a
Merge "Stop depending on libnl."
...
am: 445674ab7c
2017-10-05 09:47:03 +00:00
Treehugger Robot
445674ab7c
Merge "Stop depending on libnl."
2017-10-05 09:41:23 +00:00
Lorenzo Colitti
e439ffc762
Stop depending on libnl.
...
We only use it for trivial functions. Replace them and drop the
dependency.
Bug: 67345547
Test: bullhead builds, boots
Test: CtsOsTestCases android.os.cts.StrictModeTest passes
Change-Id: I36254962284babdd1a55a32a76dd0dc92d85420c
2017-10-05 14:56:44 +09:00
Jaegeuk Kim
0f04f72c2d
init/reboot: call MNT_FORCE at the last umount(2)
...
The last one will avoid errors=panic in ext4.
Test: Build
Bug: 63981945
Bug: 65481582
Change-Id: I9c86afcce441767e24fc43668ab1ff6230155a9f
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2017-10-04 19:30:49 -07:00
Christopher Ferris
f6f691b63c
Update the Unwinder object and add tests.
...
Changes:
- Remove unused GetReturnAddressFromDefault function and tests.
- Modify the unwinder to stop when a pc/sp in a device map.
- Modify the unwinder to skip initial frames based on map names.
- Unit tests that exercise all of the paths in the unwinder code.
- Move the test Elf/ElfInterface objects into their own file.
- Update RegsFake to handle extra cases.
- Modify libbacktrace code to use this unwinder.
The new unwinder does not implement the ignore frame functionality since
this is not used very often and is better implemented using a skip frames
in named libraries functionality.
Test: Ran new unit tests, ran backtrace tests.
Change-Id: Ifd65e9acd66ac5e2d0e04bd32a9ad870b54610ff
2017-10-04 14:40:14 -07:00
Marco Nelissen
cb1cb10d01
Merge "Fix media on W/T"
2017-10-04 21:05:22 +00:00
Marco Nelissen
593b43910b
Fix media on W/T
...
W/T enforce restrictions on linker paths, which M/S do not.
Because of this, media.extractor was unable to load its extractors on W/T.
Bug: 67405932
Test: play sounds successfully
Change-Id: I8914da74780c909da815beaffcd4d76fbe2cc6b5
2017-10-04 13:47:17 -07:00
