Commit Graph

36028 Commits

Author SHA1 Message Date
Andreas Gampe 422f1732c5 Merge "Base: Warn on using ostream<< with std::string*" am: 7229576bfe
am: b2af36f208

Change-Id: Ie9e38c5edb7dd231a36ece79bb132ea4f322fbcf
2017-09-23 01:44:40 +00:00
Andreas Gampe b2af36f208 Merge "Base: Warn on using ostream<< with std::string*"
am: 7229576bfe

Change-Id: I19312268899265d062fa568980512b7501c59ce7
2017-09-23 01:43:27 +00:00
Treehugger Robot 7229576bfe Merge "Base: Warn on using ostream<< with std::string*" 2017-09-23 01:38:42 +00:00
Andreas Gampe c8f935aa5e Base: Warn on using ostream<< with std::string*
In most reasonable cases, this is actually a bug. So add a diagnostic.

Test: m
Change-Id: Ib506b45dbdbafcb1893486b08ef13ec8f11d0357
2017-09-22 16:25:58 -07:00
Richard Uhler c0da77ee3a Merge "Revert "Add derive_gid flag for mounting sdcardfs"" am: 643e9a536c
am: 59f8cbb0ad

Change-Id: Ice11a3316f0afac256a9c4b3ec8f4cc78a345dc4
2017-09-22 17:30:09 +00:00
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 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
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
Treehugger Robot 0bb8dcb23e Merge "bootstat: Add reboot,userrequested" 2017-09-21 20:27:35 +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 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
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 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 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 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 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 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
James Hawkins 32ac3f168c Merge "libmetricslogger: Lookup tag ID by name at runtime." am: 90e9c1f06a
am: 2c41fa99eb

Change-Id: I5a8362a9f6b2a865f00c3374f7e9474756a7a9e2
2017-09-20 18:46:40 +00:00
James Hawkins 2c41fa99eb Merge "libmetricslogger: Lookup tag ID by name at runtime."
am: 90e9c1f06a

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