Tom Cherry
aea4f28852
Merge "Revert "Remove comments and code about ro.boot.slot"" am: eb00b1f3aa
...
am: 0ff5f16f7b
2017-09-21 18:49:15 +00:00
Tom Cherry
0ff5f16f7b
Merge "Revert "Remove comments and code about ro.boot.slot""
...
am: eb00b1f3aa
2017-09-21 18:46:44 +00:00
Tom Cherry
eb00b1f3aa
Merge "Revert "Remove comments and code about ro.boot.slot""
2017-09-21 18:40:56 +00:00
Tom Cherry
c5f5fd430a
Revert "Remove comments and code about ro.boot.slot"
...
This reverts commit f4ec2c50a3
2017-09-21 18:37:22 +00:00
Laura Abbott
4c0339e154
Merge "libion: Adapt to new ION interface" am: c7750dce6b
...
am: b8fc78c7d4
2017-09-21 01:14:09 +00:00
Laura Abbott
b8fc78c7d4
Merge "libion: Adapt to new ION interface"
...
am: c7750dce6b
2017-09-21 01:11:09 +00:00
Treehugger Robot
c7750dce6b
Merge "libion: Adapt to new ION interface"
2017-09-21 01:06:32 +00:00
Daniel Rosenberg
f2764d6d62
Merge "Add derive_gid flag for mounting sdcardfs" am: e3526a5ef9
...
am: 3b08ada8ef
2017-09-21 01:05:10 +00:00
Daniel Rosenberg
3b08ada8ef
Merge "Add derive_gid flag for mounting sdcardfs"
...
am: e3526a5ef9
2017-09-21 01:03:13 +00:00
Treehugger Robot
e3526a5ef9
Merge "Add derive_gid flag for mounting sdcardfs"
2017-09-21 00:57:48 +00:00
Dan Willemsen
deffd43ff4
Merge "Enable libdemangle and libunwindstack on host bionic" am: 65673033ab
...
am: e529e49262
2017-09-20 23:35:32 +00:00
Dan Willemsen
e529e49262
Merge "Enable libdemangle and libunwindstack on host bionic"
...
am: 65673033ab
2017-09-20 23:33:33 +00:00
Treehugger Robot
65673033ab
Merge "Enable libdemangle and libunwindstack on host bionic"
2017-09-20 23:30:01 +00:00
Laura Abbott
f65c7e24c3
Merge "libion: add 4.12+ kernel headers for forward compatibility" am: c849088284
...
am: af37a3e77a
2017-09-20 23:27:31 +00:00
Laura Abbott
af37a3e77a
Merge "libion: add 4.12+ kernel headers for forward compatibility"
...
am: c849088284
2017-09-20 23:24:07 +00:00
Treehugger Robot
c849088284
Merge "libion: add 4.12+ kernel headers for forward compatibility"
2017-09-20 23:19:13 +00:00
Daniel Rosenberg
b7c118522f
Add derive_gid flag for mounting sdcardfs
...
Turns on the derive_gid feature for sdcardfs. This was moved
under a mount flag in the kernel.
Test: If the derive_gid flag is supported, the first mount
should succeed. If the flag is not, the second should
succeed.
Bug: 63245673
Change-Id: If1c1bce13d14120732e420252cb5605d33ce7c40
2017-09-20 16:04:50 -07:00
Andreas Gampe
433a382d9d
Merge "Base: Delete ostream<< with std::string*" am: 2dd3b6e349
...
am: 35fc039afc
2017-09-20 22:03:56 +00:00
Andreas Gampe
35fc039afc
Merge "Base: Delete ostream<< with std::string*"
...
am: 2dd3b6e349
2017-09-20 22:01:55 +00:00
Treehugger Robot
2dd3b6e349
Merge "Base: Delete ostream<< with std::string*"
2017-09-20 21:58:39 +00:00
Mark Salyzyn
9780edadb4
Merge changes I45fbac4a,Ie390459d am: 3b5538965e
...
am: f9ce38e3e2
2017-09-20 20:25:17 +00:00
Mark Salyzyn
f9ce38e3e2
Merge changes I45fbac4a,Ie390459d
...
am: 3b5538965e
2017-09-20 20:22:46 +00:00
Treehugger Robot
3b5538965e
Merge changes I45fbac4a,Ie390459d
...
* changes:
bootstat: validate last kmsg and bootreason content more carefully
bootstat: clang-format rebase
2017-09-20 20:17:19 +00:00
Dan Willemsen
0f048675b2
Enable libdemangle and libunwindstack on host bionic
...
libunwindstack_test:UnwindTest.* are all failing, but at least this
builds.
Test: Enable host bionic; m
Test: out/soong/host/linux_bionic-x86/nativetest64/libdemangle_test/libdemangle_test
Test: out/soong/host/linux_bionic-x86/nativetest64/libunwindstack_test/libunwindstack_test
Change-Id: Ie6c774ecb4d7a467b5ea7ae977833e9cba178f2d
2017-09-20 13:16:13 -07:00
Tom Cherry
26d09e3b7c
Merge "Remove comments and code about ro.boot.slot" am: 7dcf076700
...
am: bf6168fd53
2017-09-20 19:29:13 +00:00
Tom Cherry
bf6168fd53
Merge "Remove comments and code about ro.boot.slot"
...
am: 7dcf076700
2017-09-20 19:27:43 +00:00
Tom Cherry
7dcf076700
Merge "Remove comments and code about ro.boot.slot"
2017-09-20 19:21:18 +00:00
James Hawkins
32ac3f168c
Merge "libmetricslogger: Lookup tag ID by name at runtime." am: 90e9c1f06a
...
am: 2c41fa99eb
2017-09-20 18:46:40 +00:00
James Hawkins
2c41fa99eb
Merge "libmetricslogger: Lookup tag ID by name at runtime."
...
am: 90e9c1f06a
2017-09-20 18:44:40 +00:00
Treehugger Robot
90e9c1f06a
Merge "libmetricslogger: Lookup tag ID by name at runtime."
2017-09-20 18:40:21 +00:00
Mark Salyzyn
a16e437e9d
bootstat: validate last kmsg and bootreason content more carefully
...
Establish a tighter trust relationship with digitization of the
battery level. Validate the reboot reason collected from the last
kmsg. Validate the last reboot reason before using for enhancing
system reboot reason.
Test: system/core/bootstat/boot_reason_test.sh
Bug: 63636262
Change-Id: I45fbac4a33c09295cda89de3b73c93a884033e3b
2017-09-20 11:28:02 -07:00
Mark Salyzyn
14b1e6d63d
bootstat: clang-format rebase
...
Code style has drifted too far from our current clang-format
settings.
Test: compile
Side-Effects: none
Bug: 63736262
Change-Id: Ie390459db123cfadf09aa06c8dafb1ae69a72af8
2017-09-20 11:27:56 -07:00
Andreas Gampe
4ef5011a7b
Base: Delete ostream<< with std::string*
...
In most reasonable cases, this is actually a bug. So delete the
operator overload and let the compiler complain.
Test: m
Change-Id: I7d66ec2f33cc46588b6f549876241871f19ce995
2017-09-20 10:54:20 -07:00
Tom Cherry
f4ec2c50a3
Remove comments and code about ro.boot.slot
...
ro.boot.slot_suffix is the correct parameter.
Bug: 37663204
Test: boot sailfish
Change-Id: I72f94b3c611a2280d0732321dd8de88b0530a3cd
2017-09-20 10:14:44 -07:00
Mark Salyzyn
7b25ef1ca8
Merge "bootstat: refine kernel panic details" am: 22a10f6766
...
am: 088fed7bb5
2017-09-20 15:00:54 +00:00
Mark Salyzyn
088fed7bb5
Merge "bootstat: refine kernel panic details"
...
am: 22a10f6766
2017-09-20 14:55:20 +00:00
Mark Salyzyn
22a10f6766
Merge "bootstat: refine kernel panic details"
2017-09-20 14:45:17 +00:00
Tom Cherry
707a5ad27a
Merge "init: fix typo" am: 15a14d1ad9
...
am: 00a15fc9bf
2017-09-20 00:46:31 +00:00
Tom Cherry
00a15fc9bf
Merge "init: fix typo"
...
am: 15a14d1ad9
2017-09-20 00:45:07 +00:00
Treehugger Robot
15a14d1ad9
Merge "init: fix typo"
2017-09-20 00:35:30 +00:00
James Hawkins
b2f4244f52
libmetricslogger: Lookup tag ID by name at runtime.
...
This allows the removal of the hardcoded value (which can become obsolete).
Bug: 65991710
Test: none
Change-Id: I4c9c668dbfe728852ab70d2a0ac8e6bb82a77ad3
2017-09-19 16:37:00 -07:00
Mark Salyzyn
6461089bf8
bootstat: refine kernel panic details
...
If bootloader reports kernel_panic, gives us permission for a
deeper check of which kind occurred. Resolve a problem with
some kernels that do not have the 'sysrq: SysRq :' log stutter.
Test: system/core/bootstat/boot_reason_test.sh
Bug: 63736262
Change-Id: Idb8978de7a4f4e3c671c6ab7efc5ebe841f7bbd8
2017-09-19 16:30:05 -07:00
James Hawkins
81579a09bc
Merge "libmetricslogger: Fix one incorrect (deprecated) logtag and one duplicate logtag." am: 8f3989b820
...
am: ae4ae45ca7
2017-09-19 22:52:17 +00:00
James Hawkins
ae4ae45ca7
Merge "libmetricslogger: Fix one incorrect (deprecated) logtag and one duplicate logtag."
...
am: 8f3989b820
2017-09-19 22:50:17 +00:00
Treehugger Robot
8f3989b820
Merge "libmetricslogger: Fix one incorrect (deprecated) logtag and one duplicate logtag."
2017-09-19 22:39:25 +00:00
Tom Cherry
a141907ecf
init: fix typo
...
Test: build
Change-Id: I2f6ff60356087f9fd6c6f24e3923d70b9e93dcf8
2017-09-19 13:13:17 -07:00
James Hawkins
2dcca295a6
libmetricslogger: Fix one incorrect (deprecated) logtag and one
...
duplicate logtag.
Bug: 65841976
Bug: 65961260
Test: none
Change-Id: I6491c3c05e3a56b45d4a77cfa83f8e14eb226e64
2017-09-19 12:03:47 -07:00
Tom Cherry
74c45a41cc
Merge "init: use protobuf for serialization of persistent properties" am: f5dba11085
...
am: 61b81a0341
2017-09-19 17:18:59 +00:00
Tom Cherry
61b81a0341
Merge "init: use protobuf for serialization of persistent properties"
...
am: f5dba11085
2017-09-19 17:16:59 +00:00
Tom Cherry
f5dba11085
Merge "init: use protobuf for serialization of persistent properties"
2017-09-19 17:07:00 +00:00
