Commit Graph

37486 Commits

Author SHA1 Message Date
Bowgo Tsai faaed16548 Merge "fs_mgr: removing __BEGIN_DECLS and __END_DECLS" am: 85b80dc18d am: a4b15d7e2c am: c13381d680
am: 5bcacab65f

Change-Id: I5273783cdf84cca84084bb9b3513d68bef2af203
2017-10-11 02:08:06 +00:00
Bowgo Tsai 5bcacab65f Merge "fs_mgr: removing __BEGIN_DECLS and __END_DECLS" am: 85b80dc18d am: a4b15d7e2c
am: c13381d680

Change-Id: I06eb6e086a1fbdff4de1c4bed28d136c5e81caab
2017-10-11 02:02:30 +00:00
Bowgo Tsai c13381d680 Merge "fs_mgr: removing __BEGIN_DECLS and __END_DECLS" am: 85b80dc18d
am: a4b15d7e2c

Change-Id: Ic57af6475e804fff036e318c05b6cd0123fcf402
2017-10-11 01:57:57 +00:00
Bowgo Tsai a4b15d7e2c Merge "fs_mgr: removing __BEGIN_DECLS and __END_DECLS"
am: 85b80dc18d

Change-Id: I6c86972b32534f7962656531de072a2ccc654ed8
2017-10-11 01:53:35 +00:00
Treehugger Robot 85b80dc18d Merge "fs_mgr: removing __BEGIN_DECLS and __END_DECLS" 2017-10-11 01:43:11 +00:00
Josh Gao c5d85830c2 Merge "libdebuggerd: fix tombstone tests." am: 8eada2a90f am: 877747f1f6 am: 24016570d6
am: 85ab5ca16a

Change-Id: I8709f361345362742f0daa0c21f7b98d17f730c4
2017-10-11 01:01:35 +00:00
Josh Gao 85ab5ca16a Merge "libdebuggerd: fix tombstone tests." am: 8eada2a90f am: 877747f1f6
am: 24016570d6

Change-Id: I0d07201412c756ff9d6167582ab19f3d37e7ffdd
2017-10-10 23:35:52 +00:00
Josh Gao 24016570d6 Merge "libdebuggerd: fix tombstone tests." am: 8eada2a90f
am: 877747f1f6

Change-Id: I6e593eeb02dc580316339e9cd6bede2889e0ce13
2017-10-10 23:24:32 +00:00
Josh Gao 877747f1f6 Merge "libdebuggerd: fix tombstone tests."
am: 8eada2a90f

Change-Id: I08437a54100f4ade155a7a5db6af7ab92dec1167
2017-10-10 23:16:12 +00:00
Josh Gao 8eada2a90f Merge "libdebuggerd: fix tombstone tests." 2017-10-10 23:05:12 +00:00
Josh Gao 1ce8e14568 libdebuggerd: fix tombstone tests.
Update the tests to match new output (and stop pluralizing '1 entries').

Test: `debuggerd_test{32,64} --gtest_filter="TombstoneTest.*" on hikey960
Change-Id: I16b0335715303252fad3a35d6a053a50fefdac30
2017-10-10 13:55:44 -07:00
Mark Salyzyn b2a54cff44 Merge "init+bootstat: reduce last reboot reason to canonical alias" am: 613a5a97e0 am: cfed5e795a am: 75374ba1d2
am: c0edd4a633

Change-Id: If2241b605f10ea2ea54a1feaf0631703d23ae55e
2017-10-10 20:19:47 +00:00
Mark Salyzyn c0edd4a633 Merge "init+bootstat: reduce last reboot reason to canonical alias" am: 613a5a97e0 am: cfed5e795a
am: 75374ba1d2

Change-Id: I2de7cd7c894a7c26a59221aa20efc1f7226cebeb
2017-10-10 19:40:53 +00:00
Mark Salyzyn 75374ba1d2 Merge "init+bootstat: reduce last reboot reason to canonical alias" am: 613a5a97e0
am: cfed5e795a

Change-Id: I0a6136b68ed199b5be93ff11d47a6d802d571f40
2017-10-10 19:30:26 +00:00
Mark Salyzyn cfed5e795a Merge "init+bootstat: reduce last reboot reason to canonical alias"
am: 613a5a97e0

Change-Id: I3217fe94b0b3637521ef3a9f455124155001dd0d
2017-10-10 19:26:14 +00:00
Mark Salyzyn 613a5a97e0 Merge "init+bootstat: reduce last reboot reason to canonical alias" 2017-10-10 19:18:19 +00:00
Mark Salyzyn 6290982ee3 init+bootstat: reduce last reboot reason to canonical alias
To make parsing easier for last reboot reason.  This also ensures that
last boot reason matches the content that is typically returned by the
bootloader or in turn landed in the canonical system boot reason.

Simplify parsing in bootstat.  Adjust and fix boot_reason_test.sh for
new reality.  Allow boot reason tests battery and kernel_panic to pass
if device does not support pstore (empty before and after the test).
If device somehow landed in fastboot mode while waiting for the
display, issue a fastboot reboot to move the test along.  Some cleanup
and standardization changes to the test script.

Test: system/core/bootstat/boot_reason_test.sh
Bug: 63736262
Change-Id: I97d5467c0b4a6d65df3525f1a2d0051db813d5ad
2017-10-10 09:37:59 -07:00
Bowgo Tsai d837f837ad fs_mgr: removing __BEGIN_DECLS and __END_DECLS
fs_mgr isn't usable by C now as we've migrated all fs_mgr clients in AOSP
to CPP. Removing the support for C clients.

Bug: 67024518
Bug: 67444051
Test: boot sailfish

Change-Id: Iac57f51eb6a524c6dcdc625c83af75602b4f9b3b
2017-10-10 18:17:29 +08:00
TreeHugger Robot 618169b005 Merge "storaged: record IO perf history from proto updates" 2017-10-10 01:36:19 +00:00
Jin Qian d691d6e941 storaged: record IO perf history from proto updates
Record the bandwidth when writing storaged.proto to monitor system
storage performance.

The history is maintained in 3 catergories.
1. samples of last 24 hours.
2. daily average of last 7 days.
3. weekly average of last 52 weeks.

Sampling frequency of the first catergory is set to once every hour.
Storaged also flushes proto at same frequency.

The proto file is padded to reach a minimal size of 128KB. Storaged
writes 16KB at a time. Bandwidth calculation ignores time spent in
the first write and writes smaller than 16KB.

bandwidth = total size of 16KB writes / time spent in 16KB writes

Restructured the code so that storaged.cpp handles proto load/flush.
It calls individual module to sync proto with internal data
structures.

Added a cmdline argument to dump perf history.

adb shell storaged -p
I/O perf history (KB/s) :  most_recent  <---------  least_recent
last 24 hours : 5315 3775 3659 2042 3890 5652 3649 3696 6023
last 7 days   : 4648 3532 3828 3567 3841 3359 4676
last 52 weeks : 3817 4275 3836 3766 4280 0 0 0 0 0 ...

Test: adb shell storaged -p
      atp:asit/perf/jank_systemui_test
      atp:asit/perf/appstartup_hermetic_cyclic_dropcache_test
      atp:asit/perf/appstartup_non_hermetic_cyclic_dropcache_test

Bug: 63629306
Change-Id: Ie7051e7a8df883d4a6818ea9a54a10f4dccb4843
2017-10-10 00:56:03 +00:00
Nick Kralevich 2fece05462 Merge "set O_CLOEXEC on /dev/ashmem" am: be729702ae am: 7e772f8194 am: 141a3079cf
am: a289a97d76

Change-Id: I05892096e2f542bc5d3d79e6950a5da8cb89ecef
2017-10-09 23:32:52 +00:00
Nick Kralevich a289a97d76 Merge "set O_CLOEXEC on /dev/ashmem" am: be729702ae am: 7e772f8194
am: 141a3079cf

Change-Id: Id12e81a8ffee4e25d8aec93471da3ad90da7aeba
2017-10-09 23:22:39 +00:00
Nick Kralevich 141a3079cf Merge "set O_CLOEXEC on /dev/ashmem" am: be729702ae
am: 7e772f8194

Change-Id: I6f96618cb56344a294d06be9f48c1586be3a1bbf
2017-10-09 23:06:13 +00:00
Nick Kralevich 7e772f8194 Merge "set O_CLOEXEC on /dev/ashmem"
am: be729702ae

Change-Id: Ib308d27bd05d9d824772ab76564b2ed1487e09d3
2017-10-09 22:59:32 +00:00
Treehugger Robot be729702ae Merge "set O_CLOEXEC on /dev/ashmem" 2017-10-09 22:39:47 +00:00
Yifan Hong 6586f8050d Merge "Implement android.hardware.health@2.0." 2017-10-09 20:39:00 +00:00
Nick Kralevich 30046acdb2 set O_CLOEXEC on /dev/ashmem
Ensure FDs don't leak across exec() boundaries.

Test: builds and boots. No obvious issues.
Change-Id: I00347b489ddb146b9d33442626f0e89a6cf26551
2017-10-09 13:19:36 -07:00
James Hawkins 9e857fb194 Merge "libmetricslogger: Fix the out-of-sync proto IDs for boot reason." into oc-mr1-dev am: d030d8c1ba
am: b7e9261771

Change-Id: Iafe0543c183414892fbb274dc73caad19a9bd89c
2017-10-09 15:31:51 +00:00
James Hawkins b7e9261771 Merge "libmetricslogger: Fix the out-of-sync proto IDs for boot reason." into oc-mr1-dev
am: d030d8c1ba

Change-Id: I794ef5c94b6e216615cf47c3d86c410029ec1f76
2017-10-09 15:27:14 +00:00
James Hawkins d030d8c1ba Merge "libmetricslogger: Fix the out-of-sync proto IDs for boot reason." into oc-mr1-dev 2017-10-09 15:21:01 +00:00
Jeffrey Vander Stoep ce570b8081 Merge "Allow redeclaring typeattributes" am: f8bc6cee3f am: ceb5dea905 am: b7559e571b
am: e04a7757ac

Change-Id: I559b7d67801a5da8565d7119ca4b2d8f050f86f5
2017-10-08 04:22:18 +00:00
Jeffrey Vander Stoep e04a7757ac Merge "Allow redeclaring typeattributes" am: f8bc6cee3f am: ceb5dea905
am: b7559e571b

Change-Id: I093f8be7b4f8c810d4ffefab5461687bdc883ac7
2017-10-08 04:18:13 +00:00
Jeffrey Vander Stoep b7559e571b Merge "Allow redeclaring typeattributes" am: f8bc6cee3f
am: ceb5dea905

Change-Id: I59283077344f07c325f49da191c291f69b8ac1ae
2017-10-08 04:12:41 +00:00
Jeffrey Vander Stoep ceb5dea905 Merge "Allow redeclaring typeattributes"
am: f8bc6cee3f

Change-Id: I119e687a3aaf397ac38365728f6bf9e7c24c1067
2017-10-08 04:08:45 +00:00
Jeffrey Vander Stoep f8bc6cee3f Merge "Allow redeclaring typeattributes" 2017-10-08 04:02:55 +00:00
Jeff Vander Stoep 5e9ba3c50b Allow redeclaring typeattributes
Allows partners to add a new attribute definition to their public
policy without causing a compatibility failure with the AOSP system
image.

Bug: 67092827
Bug: 37915794
Test: build and boot aosp_sailfish with a new type declared in public
    policy.

Change-Id: I3899065affb6806ae9080e1a7dfa5a6f368370f0
2017-10-06 17:04:28 -07:00
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

Change-Id: Ie23ca0db1a00b1e0aaa13f5108137b84efb3a6ed
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

Change-Id: Iba32c243804a3b4458ddd1e7d9e85377aac87c01
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

Change-Id: I039a405369d50a69945ed2ad9c09a714b4bd01b0
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

Change-Id: Id6db3ff466099d18698c49d8452df44dec3d27b5
2017-10-06 21:41:54 +00:00
James Hawkins 56a336136d 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
(cherry picked from commit f01dbc30ef)
2017-10-06 14:37:23 -07: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

Change-Id: Ic0004f471af3a6cdaf1d14e9d3824141ea999326
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

Change-Id: I7afef0bf95ca413593e6bf36f07432af3fa41614
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

Change-Id: I5c0ab48cd1ad208b2eb3d499d7f1b4473417b6c4
2017-10-06 20:36:56 +00:00
Tom Cherry 2f5b8bb3f0 Merge "init: use ro.init.subcontexts_enabled to enable subcontexts"
am: 99016bce92

Change-Id: If410f650dd67577957d653ecd0b1a1e5a45dd14a
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