Richard Uhler
59f8cbb0ad
Merge "Revert "Add derive_gid flag for mounting sdcardfs""
...
am: 643e9a536c
Change-Id: Ibfe1bcd882e81e491cfc33c8077b77dc53a40de1
2017-09-22 17:24:00 +00:00
Treehugger Robot
643e9a536c
Merge "Revert "Add derive_gid flag for mounting sdcardfs""
2017-09-22 17:21:55 +00:00
Richard Uhler
f09f965f9f
Revert "Add derive_gid flag for mounting sdcardfs"
...
This reverts commit 8ca02bbeb5
.
Causes boot loop on bullhead.
(cherry picked from commit 28dbcaa23b
)
Bug: 63245673
Bug: 65660058
Test: m
Merged-In: Ife5f83ebf56fb956e5015d2797b5b47a515ec171
Change-Id: Ife5f83ebf56fb956e5015d2797b5b47a515ec171
2017-09-22 09:03:18 -07:00
Andreas Gampe
88253f1511
Merge "Revert "Base: Delete ostream<< with std::string*"" am: 7178e29c22
am: 3578488787
...
am: 29769551c0
Change-Id: I64a35d031068bc1e8f631cf19300f9694e5a240b
2017-09-22 03:17:40 +00:00
Andreas Gampe
29769551c0
Merge "Revert "Base: Delete ostream<< with std::string*"" am: 7178e29c22
...
am: 3578488787
Change-Id: I2213f75007d44cf899b9b3ed55461160e101b467
2017-09-22 03:15:11 +00:00
Andreas Gampe
3578488787
Merge "Revert "Base: Delete ostream<< with std::string*""
...
am: 7178e29c22
Change-Id: If69984052f6e1fd234480edfe61cdb3ebdefcc35
2017-09-22 03:12:40 +00:00
Treehugger Robot
7178e29c22
Merge "Revert "Base: Delete ostream<< with std::string*""
2017-09-22 03:07:23 +00:00
Andreas Gampe
2db3823632
Revert "Base: Delete ostream<< with std::string*"
...
This reverts commit 4ef5011a7b
.
Reason for revert: Breaks an internal mocking case that cannot be changed.
Test: m
Change-Id: I83f9338bde02eb2b45b3e52b66ef78490ddbeeda
2017-09-21 17:53:00 -07:00
Yoshitaka Seto
1d444319d7
Remove pstore related unit tests from CTS
...
am: 5dec8e22c3
Change-Id: Ifba13f9d714e58eaa3358a48246c71f90687629e
2017-09-21 23:25:34 +00:00
Mark Salyzyn
dc58ecf8ed
Merge "bootstat: Add reboot,userrequested" am: 0bb8dcb23e
am: a451a98f0e
...
am: c7e4b4c94c
Change-Id: I6667cc7f407746aa4719b99a971d7f4f88c54920
2017-09-21 22:16:50 +00:00
Mark Salyzyn
c7e4b4c94c
Merge "bootstat: Add reboot,userrequested" am: 0bb8dcb23e
...
am: a451a98f0e
Change-Id: Iad418b7c81d963e4311f3c680d995dc06bffe025
2017-09-21 21:55:15 +00:00
Mark Salyzyn
a451a98f0e
Merge "bootstat: Add reboot,userrequested"
...
am: 0bb8dcb23e
Change-Id: I2c52c860c6592ce7c8ad896b69c54ec963b87790
2017-09-21 21:46:53 +00:00
Yoshitaka Seto
5dec8e22c3
Remove pstore related unit tests from CTS
...
Pstore test cases should not belong to CTS.
The test cases should be a part of GTS if really required.
Test: manual
Bug: 66431569
Bug: 63969981
Bug: 63913130
Signed-off-by: Srinavasa Nagaraju <Srinavasa.Nagaraju@sony.com>
Signed-off-by: Yoshitaka Seto <yoshitaka.seto@sony.com>
Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Tested-by: Srinavasa Nagaraju <Srinavasa.Nagaraju@sony.com>
Change-Id: Icd326403711ad268ce28a3863045fc9b2f211461
2017-09-21 13:37:50 -07:00
Treehugger Robot
0bb8dcb23e
Merge "bootstat: Add reboot,userrequested"
2017-09-21 20:27:35 +00:00
Tom Cherry
b616ea4068
Merge "Revert "Remove comments and code about ro.boot.slot"" am: eb00b1f3aa
am: 0ff5f16f7b
...
am: aea4f28852
Change-Id: Ia2959362f8a48e1d3638a76e9c72f04d276cd5bc
2017-09-21 18:51:15 +00:00
Tom Cherry
aea4f28852
Merge "Revert "Remove comments and code about ro.boot.slot"" am: eb00b1f3aa
...
am: 0ff5f16f7b
Change-Id: Ia57b7637ef10683724ccf7666ba98b660d527e91
2017-09-21 18:49:15 +00:00
Tom Cherry
0ff5f16f7b
Merge "Revert "Remove comments and code about ro.boot.slot""
...
am: eb00b1f3aa
Change-Id: If6b511a19009e28a63b52e6701dbc8f7b1f514f7
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
.
Dependencies hadn't been merged yet.
Bug: 66437505
Change-Id: I7551b7f2f184a6fefc39e184a42dc8d323c58b89
2017-09-21 18:37:22 +00:00
Mark Salyzyn
9033bf5a2e
bootstat: Add reboot,userrequested
...
Result of holding power button down and hitting restart.
Test: compile
Bug: 63736262
Change-Id: I271bdf135cece5fd9dc9e60ddf8add595ed3da4c
2017-09-21 11:30:29 -07:00
Laura Abbott
33b23ae8b2
Merge "libion: Adapt to new ION interface" am: c7750dce6b
am: b8fc78c7d4
...
am: 4c0339e154
Change-Id: I896e8ceebf64253978f671e545adf8a41ae8b191
2017-09-21 01:16:11 +00:00
Laura Abbott
4c0339e154
Merge "libion: Adapt to new ION interface" am: c7750dce6b
...
am: b8fc78c7d4
Change-Id: Ice84ec1fb741f345f2459670f773d06c97992e55
2017-09-21 01:14:09 +00:00
Laura Abbott
b8fc78c7d4
Merge "libion: Adapt to new ION interface"
...
am: c7750dce6b
Change-Id: I901ea405edd09385491b5e28b4b6e06f68f83f28
2017-09-21 01:11:09 +00:00
Daniel Rosenberg
92a3a52851
Merge "Add derive_gid flag for mounting sdcardfs" am: e3526a5ef9
am: 3b08ada8ef
...
am: f2764d6d62
Change-Id: Ied46eb7dd9ea5fbccbb995d531d2d5b34f51d0ad
2017-09-21 01:07:40 +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
Change-Id: I03298b52f637eca7b33d1a5fd5c4c9ed4f58276e
2017-09-21 01:05:10 +00:00
Daniel Rosenberg
3b08ada8ef
Merge "Add derive_gid flag for mounting sdcardfs"
...
am: e3526a5ef9
Change-Id: I3543e1eb46866ed9b11a6d2d133de8edbf76cb2c
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
95beb3d3e4
Merge "Enable libdemangle and libunwindstack on host bionic" am: 65673033ab
am: e529e49262
...
am: deffd43ff4
Change-Id: Ic775d04495f888fc37409dc926703af0f17b6cd2
2017-09-20 23:37:32 +00:00
Dan Willemsen
deffd43ff4
Merge "Enable libdemangle and libunwindstack on host bionic" am: 65673033ab
...
am: e529e49262
Change-Id: I1f9df55f1473e4f803260482942fe1fb0e240050
2017-09-20 23:35:32 +00:00
Dan Willemsen
e529e49262
Merge "Enable libdemangle and libunwindstack on host bionic"
...
am: 65673033ab
Change-Id: I27b45ee054f23c0c42b265d3f5dc01ab7c9e8905
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
1907d27420
Merge "libion: add 4.12+ kernel headers for forward compatibility" am: c849088284
am: af37a3e77a
...
am: f65c7e24c3
Change-Id: I618c09246a18f6e2feb1414ce3e76599b74cd276
2017-09-20 23:29:35 +00:00
Laura Abbott
f65c7e24c3
Merge "libion: add 4.12+ kernel headers for forward compatibility" am: c849088284
...
am: af37a3e77a
Change-Id: I628260ec6f2f0c7d7bdb9c44e241958e3f9d4889
2017-09-20 23:27:31 +00:00
Laura Abbott
af37a3e77a
Merge "libion: add 4.12+ kernel headers for forward compatibility"
...
am: c849088284
Change-Id: I761006c6460206dc31028cb7eef20b50a53be7ba
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
b399e775ac
Merge "Base: Delete ostream<< with std::string*" am: 2dd3b6e349
am: 35fc039afc
...
am: 433a382d9d
Change-Id: I46dbd5ffdb9692711cacfb5fd5f7a8e897ab3ed7
2017-09-20 22:05:55 +00:00
Andreas Gampe
433a382d9d
Merge "Base: Delete ostream<< with std::string*" am: 2dd3b6e349
...
am: 35fc039afc
Change-Id: Ie9983ffb6fe10bb85530b6a6ed677cbf990fdd50
2017-09-20 22:03:56 +00:00
Andreas Gampe
35fc039afc
Merge "Base: Delete ostream<< with std::string*"
...
am: 2dd3b6e349
Change-Id: I6aac826ec56dec657f70357e3bdaad76f8ddb871
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
4213af2b1d
Merge changes I45fbac4a,Ie390459d am: 3b5538965e
am: f9ce38e3e2
...
am: 9780edadb4
Change-Id: Ib2bf28d4235cc579664fd78f92bcd73528079f02
2017-09-20 20:27:18 +00:00
Mark Salyzyn
9780edadb4
Merge changes I45fbac4a,Ie390459d am: 3b5538965e
...
am: f9ce38e3e2
Change-Id: I429f78f8cf1a2235d68a224b2e44828ceda53188
2017-09-20 20:25:17 +00:00
Mark Salyzyn
f9ce38e3e2
Merge changes I45fbac4a,Ie390459d
...
am: 3b5538965e
Change-Id: I536828c2df621eff0c6c528a2ad2b74e863eab79
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
897fab0545
Merge "Remove comments and code about ro.boot.slot" am: 7dcf076700
am: bf6168fd53
...
am: 26d09e3b7c
Change-Id: I08a4e0ea745f9471e7aabdc579c423528e60103b
2017-09-20 19:31:17 +00:00
Tom Cherry
26d09e3b7c
Merge "Remove comments and code about ro.boot.slot" am: 7dcf076700
...
am: bf6168fd53
Change-Id: I1cb67a35af50f40656bd9215e5d7bba3da54df5f
2017-09-20 19:29:13 +00:00
Tom Cherry
bf6168fd53
Merge "Remove comments and code about ro.boot.slot"
...
am: 7dcf076700
Change-Id: Ic28c5bd369d45489150741b1c1cf2b4c00c4eb52
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