ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
15398 commits 1 branch 0 tags 217 MiB
Commit graph

15398 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thierry Strudel
9faa258f71 am 2407ec38: am 8703bea1: Merge "fs_config: replace getenv(\'OUT\') by new fs_config parameter" into mnc-dev 
* commit '2407ec386514e40c5b4f2489c598b15af2a67c97':
  fs_config: replace getenv('OUT') by new fs_config parameter
 2015-07-10 19:26:22 +00:00
Thierry Strudel
2407ec3865 am 8703bea1: Merge "fs_config: replace getenv(\'OUT\') by new fs_config parameter" into mnc-dev 
* commit '8703bea1807326fef9835bc474e7a7288c725925':
  fs_config: replace getenv('OUT') by new fs_config parameter
 2015-07-10 18:43:45 +00:00
Thierry Strudel
8703bea180 Merge "fs_config: replace getenv('OUT') by new fs_config parameter" into mnc-dev 2015-07-10 18:28:03 +00:00
Andres Morales
07f0aef8b9 am a5c8358a: am 787c3764: Merge "[gatekeeperd] fix use of uninitialized memory" into mnc-dev 
* commit 'a5c8358a31a62315b9904d508316d3d4ca962d93':
  [gatekeeperd] fix use of uninitialized memory
 2015-07-10 18:14:14 +00:00
Andres Morales
beb4fa627b am b8fb72e0: am 0b0435ea: [gatekeeperd] fix file descriptor leak 
* commit 'b8fb72e02ffccab7d3c7370c395085b5cab40497':
  [gatekeeperd] fix file descriptor leak
 2015-07-10 17:55:50 +00:00
Andres Morales
a5c8358a31 am 787c3764: Merge "[gatekeeperd] fix use of uninitialized memory" into mnc-dev 
* commit '787c3764d305168e927c29d5d57ae68e242cd7a9':
  [gatekeeperd] fix use of uninitialized memory
 2015-07-10 17:30:28 +00:00
Andres Morales
787c3764d3 Merge "[gatekeeperd] fix use of uninitialized memory" into mnc-dev 2015-07-10 17:20:31 +00:00
Andres Morales
b8fb72e02f am 0b0435ea: [gatekeeperd] fix file descriptor leak 
* commit '0b0435ea87f87b31652a2c6272c1f77438bfcdf1':
  [gatekeeperd] fix file descriptor leak
 2015-07-10 17:10:33 +00:00
Andres Morales
0b0435ea87 [gatekeeperd] fix file descriptor leak 
Bug: 22403703
Change-Id: I65da3b3b3f85db035d79277344beb5460cb025f2
 2015-07-10 09:47:09 -07:00
Thierry Strudel
df33ffadd2 fs_config: replace getenv('OUT') by new fs_config parameter 
Using a getenv('OUT') in such a deep down function is a wrong design
choice. Replacing with explicit parameter that may be NULL in case
device specific files can be accessed from /.
Since TARGET_COPY_OUT_SYSTEM may be defined to something different than
system we also ensure that we use a path relative to TARGET_OUT to
compute path to fs_config_* files.

Bug: 21989305
Bug: 22048934
Change-Id: Id91bc183b29beac7379d1117ad83bd3346e6897b
Signed-off-by: Thierry Strudel <tstrudel@google.com>
 2015-07-09 21:47:07 -07:00
Christopher Ferris
e7203eea22 am c03e40fb: am a3ee46f1: Merge "Dump memory going from unreadable to readable." 
* commit 'c03e40fb8170a40377823a5a5dbe087df0887acc':
  Dump memory going from unreadable to readable.
 2015-07-10 00:02:28 +00:00
Christopher Ferris
c03e40fb81 am a3ee46f1: Merge "Dump memory going from unreadable to readable." 
* commit 'a3ee46f1056fd52b05b627319cf82da75c6c7e59':
  Dump memory going from unreadable to readable.
 2015-07-09 23:48:37 +00:00
Christopher Ferris
a3ee46f105 Merge "Dump memory going from unreadable to readable." 2015-07-09 23:38:26 +00:00
Pirama Arumuga Nainar
f6b2a7ffe2 am 85074538: am 8cd62808: Merge "Use delete[] to de-allocate pointers from new[]" 
* commit '850745382a294b2d9ab8d5288980a3858821cb0a':
  Use delete[] to de-allocate pointers from new[]
 2015-07-09 23:06:08 +00:00
Pirama Arumuga Nainar
850745382a am 8cd62808: Merge "Use delete[] to de-allocate pointers from new[]" 
* commit '8cd62808d40de4ebd3ce95ea151fcc13260103fd':
  Use delete[] to de-allocate pointers from new[]
 2015-07-09 22:50:56 +00:00
Pirama Arumuga Nainar
8cd62808d4 Merge "Use delete[] to de-allocate pointers from new[]" 2015-07-09 22:40:32 +00:00
Christopher Ferris
456abbabf2 Dump memory going from unreadable to readable. 
If the first read when dumping memory returns no data, skip ahead to
the next page boundary and try and read from there. This fixes a case
where the address at which to start dumping memory is unreadable, but
crosses back into readable memory.

Bug: 22234753
Change-Id: Ie28d5c027013577ca06f5396aba498366a3b6749
 2015-07-09 15:35:47 -07:00
Dan Albert
01c48dceba am 00599eca: am e84205bf: Merge "Revert "Turn on -Wformat-nonliteral."" 
* commit '00599eca7446f28762da3854566cff0b2ba46799':
  Revert "Turn on -Wformat-nonliteral."
 2015-07-09 21:04:17 +00:00
Dan Albert
00599eca74 am e84205bf: Merge "Revert "Turn on -Wformat-nonliteral."" 
* commit 'e84205bf6ee391c9e2fec14b6bffc1f9f096bfdf':
  Revert "Turn on -Wformat-nonliteral."
 2015-07-09 20:49:15 +00:00
Dan Albert
e84205bf6e Merge "Revert "Turn on -Wformat-nonliteral."" 2015-07-09 20:35:36 +00:00
Dan Albert
286bb6ddbd Revert "Turn on -Wformat-nonliteral." 
One of my build aliases doesn't play nice with USE_MINGW=1, so my build lied to me. Will revert until I fix it up.

This reverts commit 459df8f3a1.

Change-Id: I7905c5ae5ee85fb2d228ce63d81c79f140998c18
 2015-07-09 20:35:09 +00:00
Dan Albert
1ce139b2ce am fcdc3141: am a35affb5: Merge "Turn on -Wformat-nonliteral." 
* commit 'fcdc3141d3209afb8a8a62764fa66911a7104e74':
  Turn on -Wformat-nonliteral.
 2015-07-09 20:20:41 +00:00
Dan Albert
fcdc3141d3 am a35affb5: Merge "Turn on -Wformat-nonliteral." 
* commit 'a35affb5fc9e7cd19a2669a82cda19789314a783':
  Turn on -Wformat-nonliteral.
 2015-07-09 20:00:55 +00:00
Dan Albert
a35affb5fc Merge "Turn on -Wformat-nonliteral." 2015-07-09 19:48:55 +00:00
Elliott Hughes
33cd7314a3 am 9d748c8b: am a6241a02: Merge "Replace HAVE_WIN32_IPC with _WIN32." 
* commit '9d748c8bf4b3b4810c6ad9dcc75322c8059c3876':
  Replace HAVE_WIN32_IPC with _WIN32.
 2015-07-09 17:57:35 +00:00
Pirama Arumuga Nainar
837eff22c8 Use delete[] to de-allocate pointers from new[] 
Upstream clang has a new diagnostic, '-Wmismatched-new-delete' to
generate a warning (that becomes an error with -Werror) when delete is
used to deallocate pointers created with 'new[]'.  This patch fixes
'delete's that trigger this warning/error.

Change-Id: I7551e856b4b13bfae4cb78b5664d8652322683cf
 2015-07-09 10:50:04 -07:00
Dan Albert
459df8f3a1 Turn on -Wformat-nonliteral. 
Apparently there are two classes of this warning in clang.
-Wformat-security is only emitted for cases of
`func(nonliteral_fmt_string)` (no args), and -Wformat-nonliteral is
emitted for cases *with* arguments. For whatever reason, the latter
isn't included in -Wextra and must be manually enabled.

To make this more easily portable to Windows, move the existing
gnu_printf/__printf__ decision into base/macros.h as ATTRIBUTE_FORMAT.

Change-Id: I3b0990e1d1f0a2e9c13b32f5cd60478946cb5fc6
 2015-07-09 10:47:24 -07:00
Elliott Hughes
9d748c8bf4 am a6241a02: Merge "Replace HAVE_WIN32_IPC with _WIN32." 
* commit 'a6241a0298de5e773ef113626ca4686f9c038868':
  Replace HAVE_WIN32_IPC with _WIN32.
 2015-07-09 17:29:46 +00:00
Elliott Hughes
a6241a0298 Merge "Replace HAVE_WIN32_IPC with _WIN32." 2015-07-09 17:16:13 +00:00
Elliott Hughes
095307ec49 Replace HAVE_WIN32_IPC with _WIN32. 
Change-Id: Ie9dc064fb23a4e4bd4856c9668784dec0be9d2d6
 2015-07-09 10:03:18 -07:00
Christopher Ferris
6093754759 am 0473a1ea: am b6deb331: Merge "New property that determines when to wait for gdb." 
* commit '0473a1ea51ff42695a678e90f27b564d4aaf7f57':
  New property that determines when to wait for gdb.
 2015-07-08 23:31:03 +00:00
Christopher Ferris
0473a1ea51 am b6deb331: Merge "New property that determines when to wait for gdb." 
* commit 'b6deb33120a2b84b64fbf63bf2ec17bc8d13d2e3':
  New property that determines when to wait for gdb.
 2015-07-08 23:17:10 +00:00
Christopher Ferris
b6deb33120 Merge "New property that determines when to wait for gdb." 2015-07-08 23:07:21 +00:00
Christopher Ferris
d79f2bebcc New property that determines when to wait for gdb. 
Use debug.debuggerd.wait_for_gdb being set to non-zero to
determine if debuggerd should stop and wait for someone to
attach gdb to the crashing process.

Bug: 22233908
Change-Id: Id55a1572b479a70d395b7270392ce6fb70dbfdca
 2015-07-08 16:01:49 -07:00
Daniel Rosenberg
801ee194d6 am 32933ff5: am dc4fa7f6: Merge "Fix "adb remount" for when the root directory is in system.img" 
* commit '32933ff511a4b63f60543c97e2fc3b47ea465d1a':
  Fix "adb remount" for when the root directory is in system.img
 2015-07-08 20:42:20 +00:00
Andres Morales
fef908e5a5 [gatekeeperd] fix use of uninitialized memory 
Bug: 22319772
Change-Id: I3cb83389f11e54867aca132de48a3f6407b7eaf3
 2015-07-08 20:33:36 +00:00
Daniel Rosenberg
32933ff511 am dc4fa7f6: Merge "Fix "adb remount" for when the root directory is in system.img" 
* commit 'dc4fa7f68a5cf2a2d94b9e2c401d7af0bcf2f5ca':
  Fix "adb remount" for when the root directory is in system.img
 2015-07-08 20:27:31 +00:00
Daniel Rosenberg
dc4fa7f68a Merge "Fix "adb remount" for when the root directory is in system.img" 2015-07-08 20:15:15 +00:00
Christopher Ferris
78ec30d952 am 708e5438: am 41a0654e: Merge "Replace all _LOG error calls with ALOGE." 
* commit '708e543827464c615866615ab911bf8d1128dc4b':
  Replace all _LOG error calls with ALOGE.
 2015-07-08 19:44:55 +00:00
Daniel Rosenberg
d6eba89f83 Fix "adb remount" for when the root directory is in system.img 
When the root directory has been built into system.img, it is
mounted at /.

Change-Id: If01d12efeaa53b4ae59e801a6e9b802a9ae5882d
 2015-07-08 19:36:19 +00:00
Christopher Ferris
708e543827 am 41a0654e: Merge "Replace all _LOG error calls with ALOGE." 
* commit '41a0654e2a76a8c639b2265513345cc4c268560d':
  Replace all _LOG error calls with ALOGE.
 2015-07-08 19:27:12 +00:00
Christopher Ferris
41a0654e2a Merge "Replace all _LOG error calls with ALOGE." 2015-07-08 19:16:03 +00:00
Sami Tolvanen
7a6e04fe51 am eb528dd5: Merge "fs_mgr: Use ro.boot.veritymode" into mnc-dr-dev 
* commit 'eb528dd5a152d66216b9a2793a3619a65411950c':
  fs_mgr: Use ro.boot.veritymode
 2015-07-08 16:07:01 +00:00
Sami Tolvanen
eb528dd5a1 Merge "fs_mgr: Use ro.boot.veritymode" into mnc-dr-dev 2015-07-08 15:26:17 +00:00
Sami Tolvanen
3fd58ae7e5 fs_mgr: Use ro.boot.veritymode 
If verity state is managed by bootloader, it will pass the verity
mode to the kernel in the androidboot.veritymode command line
parameter. Init copies the value to the ro.boot.veritymode property.

Check for ro.boot.veritymode in fs_mgr and use the value to set
dm-verity mode. If this property is not set, store verity state in
metadata as before, if a storage location is specified in fstab.

Bug: 21605676
Change-Id: Ife3c978c133248432c302583d3b70e179605fe42
(cherry picked from commit ac5c1224cf)
 2015-07-08 07:54:24 +00:00
Elliott Hughes
d8af16bf45 am dba00aab: am c9aeae27: Merge "Fix debuggerd\'s gdbclient instructions." 
* commit 'dba00aab9299971babe101a03af265fbf7257f49':
  Fix debuggerd's gdbclient instructions.
 2015-07-07 22:18:27 +00:00
Elliott Hughes
dba00aab92 am c9aeae27: Merge "Fix debuggerd\'s gdbclient instructions." 
* commit 'c9aeae27403db86e1ec30c953f1d0fd6ae63b184':
  Fix debuggerd's gdbclient instructions.
 2015-07-07 22:02:11 +00:00
Elliott Hughes
c9aeae2740 Merge "Fix debuggerd's gdbclient instructions." 2015-07-07 21:42:24 +00:00
Elliott Hughes
39a28c2526 Fix debuggerd's gdbclient instructions. 
We improved gdbclient to make the process simpler, but didn't update
debuggerd to match.

Bug: http://b/22233857
Change-Id: If4137943f567a9e566a3ac7f485c9b1eab2c68e9
 2015-07-07 14:34:39 -07:00
Paul Lawrence
e8308f852c am 81046166: Merge "Revert "Change init sequence to support file level encryption"" into mnc-dev 
* commit '8104616696ac5e806b16a393ea02c4f5d8efc328':
  Revert "Change init sequence to support file level encryption"
 2015-07-07 18:20:27 +00:00