Tom Cherry
9bc2a967cf
Merge "Reland "Remove comments and code about ro.boot.slot""
...
am: dea5e081ac
Change-Id: Idf32e9600b6a3b93a6a2b4c414cc0193d5d65fb9
2017-09-26 00:08:55 +00:00
Tom Cherry
dea5e081ac
Merge "Reland "Remove comments and code about ro.boot.slot""
2017-09-25 23:58:30 +00:00
Saurabh Shah
90a74600d7
sync: store the num_fences from first SYNC_IOC_FILE_INFO
...
Fixes a bug with the signal time of devices using the
modern sync file interface. The bug only affects kernels running
an Android kernel 4.9 and later.
b/63395253
Test: tests/sync_test.cpp
Change-Id: I6fb00bcb8e16a3268c357153edd8e35a44546caa
2017-09-25 15:51:46 -07:00
George Burgess IV
64b6ce0d75
Merge "Silence static analyzer warnings about memory leaks" am: 20ae530e01
...
am: 07406662a4
Change-Id: I4701d6691e538dee564b6e87fe0206bd001a0e23
2017-09-25 19:48:06 +00:00
George Burgess IV
07406662a4
Merge "Silence static analyzer warnings about memory leaks"
...
am: 20ae530e01
Change-Id: I3501573fbf2767570b5d9a615a5f53637b9771fd
2017-09-25 19:45:26 +00:00
Treehugger Robot
20ae530e01
Merge "Silence static analyzer warnings about memory leaks"
2017-09-25 19:41:13 +00:00
Christopher Ferris
e288e330c8
Merge "Add a new unwind method on error." am: 9b91324cb0
...
am: fb8ea2626b
Change-Id: Ie444adce663073d03c746fdef0e9ea274e0b09e4
2017-09-25 19:26:05 +00:00
Christopher Ferris
fb8ea2626b
Merge "Add a new unwind method on error."
...
am: 9b91324cb0
Change-Id: I99aca55a9ae9ffd2c7220885ec033486996b31a6
2017-09-25 19:24:07 +00:00
Christopher Ferris
9b91324cb0
Merge "Add a new unwind method on error."
2017-09-25 19:16:59 +00:00
Tom Cherry
211a4a5d5a
Reland "Remove comments and code about ro.boot.slot"
...
This reverts commit c5f5fd430a
.
Dependencies are now merged.
Bug: 37663204
Bug: 66437505
Change-Id: I84284b6bc37f6aae4096dec73f45ebd85d28ca9d
2017-09-25 16:04:30 +00:00
Josh Gao
5d0e0fbdbb
Merge "tombstoned: fix another call to evconnlistener_new." am: baea76dba7
...
am: 6d0d6c34cd
Change-Id: I3473abcea7d65a5477639b5ddcec4fe794975cc1
2017-09-25 13:03:10 +00:00
Josh Gao
6d0d6c34cd
Merge "tombstoned: fix another call to evconnlistener_new."
...
am: baea76dba7
Change-Id: I37f27333ea52881056b04341699c671244ab0835
2017-09-25 13:00:40 +00:00
Treehugger Robot
baea76dba7
Merge "tombstoned: fix another call to evconnlistener_new."
2017-09-25 12:57:30 +00:00
Narayan Kamath
dbacd826a1
zip_archive: reject files that don't start with an LFH signature.
...
Bug: 64211847
Test: zip_archive_test
Merged-In: I275e7c4da05ceeb20401b560c72294f29ef63642
Change-Id: I38705f4e9688326a140aa59a1333b0878ed39c14
2017-09-25 11:57:55 +01:00
George Burgess IV
80136a1e41
Silence static analyzer warnings about memory leaks
...
The static analyzer complains that this memory is leaked regardless of
how I try to work around it (unless we escape the memory by using a
global or something, but...). Basically, as long as there's some sort
of operation on the reinterpret_cast'ed pointer, it complains. If we
remove the bitwise negations, it doesn't. Doing so would presumably
defeat the purpose of this test, though, so add a NOLINT.
Bug: 27101951
Test: mma. No more static analyzer warning for this file.
Change-Id: If9008946a2145d17b8651535141bfd7ec9224739
2017-09-24 13:36:29 -07:00
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
Josh Gao
ce9cc4e428
tombstoned: fix another call to evconnlistener_new.
...
Apply the same fix from c2e98f63
to intercept_manager.cpp.
Bug: http://b/64543673
Test: debuggerd_test
Change-Id: Ibfb919e059fa62f8336cfc1426d03ef015590136
2017-09-22 18:00:35 -07:00
Christopher Ferris
b9de87f7ed
Add a new unwind method on error.
...
If a function crashes by jumping into unexecutable code, the old method
could not unwind through that. Add a fallback method to set the pc from
the default return address location.
In addition, add a new finished check for steps. This will provide a method
to indicate that this step is the last step. This prevents cases where
the fallback method might be triggered incorrectly.
Update the libbacktrace code to unwind using the new methodology.
Update the unwind tool to use the new unwind methodology.
Add a new option to crasher that calls through a null function.
Create a new object, Unwinder, that encapsulates the a basic unwind. For now,
libbacktrace will still use the custom code.
Added new unit tests to cover the new cases. Also add a test that
crashes calling a nullptr as a function, and then has call frames in
the signal stack.
Bug: 65842173
Test: Pass all unit tests, verify crasher dumps properly.
Change-Id: Ia18430ab107e9f7bdf0e14a9b74710b1280bd7f4
2017-09-22 16:55:12 -07: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